[database]: Fix "program:redisprogram:redis_bmp" ERR from supervisor#20726
Merged
qiluo-msft merged 1 commit intosonic-net:masterfrom Nov 21, 2024
Conversation
== Why I did it == Commit 06c469e added an extra redis instance. This resulted in a two item string without linefeeds in /etc/supervisor/critical_processes: program:redisprogram:redis_bmp That resulted in an error in syslog and docker-database failing. == Work item tracking == ERR database#supervisor-proc-exit-listener: Syntax of the line program:redisprogram:redis_bmp#012 in processes file is incorrect. Exiting... (sonic-net#20636) #17 == How I did it == Replace the jinja2 whitespace eating hyphens from BOL to EOL. Note that j2 and the jinja2 parser in sonig-cfggen do not behave the same. The sonig-cfggen is the relevant one. Before: $ j2 ./dockers/docker-database/critical_processes.j2.old -f json \ <<< '{"INSTANCES":{"foo":"bar","baz":"..."}}' | | program:foo program:baz # docker exec database sonic-cfggen \ -j /var/run/redis/sonic-db/database_config.json \ -t /usr/share/sonic/templates/critical_processes.j2.old program:redisprogram:redis_bmp After: $ j2 ./dockers/docker-database/critical_processes.j2 -f json \ <<< '{"INSTANCES":{"foo":"bar","baz":"..."}}' program:foo program:baz # docker exec database sonic-cfggen \ -j /var/run/redis/sonic-db/database_config.json \ -t /usr/share/sonic/templates/critical_processes.j2 program:redis program:redis_bmp | After this fix, the output in /etc/supervisor/critical_processes is correct and the error from docker-database is gone.
|
|
Collaborator
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
FengPan-Frank
approved these changes
Nov 20, 2024
Contributor
|
/azpw run Azure.sonic-buildimage |
FengPan-Frank
approved these changes
Nov 20, 2024
Contributor
FengPan-Frank
left a comment
FengPan-Frank
left a comment
There was a problem hiding this comment.
Thanks for the fix, seems multiple instance was added but not fully supported before.
qiluo-msft
approved these changes
Nov 21, 2024
Merged
wdoekes
added a commit
to ossobv/sonic-buildimage
that referenced
this pull request
Nov 22, 2024
…onic-net#20726) == Why I did it == Commit 06c469e added an extra redis instance. This resulted in a two item string without linefeeds in /etc/supervisor/critical_processes: program:redisprogram:redis_bmp That resulted in an error in syslog and docker-database failing. == Work item tracking == ERR database#supervisor-proc-exit-listener: Syntax of the line program:redisprogram:redis_bmp#012 in processes file is incorrect. Exiting... (sonic-net#20636) #17 == How I did it == Replace the jinja2 whitespace eating hyphens from BOL to EOL. Note that j2 and the jinja2 parser in sonig-cfggen do not behave the same. The sonig-cfggen is the relevant one. Before: $ j2 ./dockers/docker-database/critical_processes.j2.old -f json \ <<< '{"INSTANCES":{"foo":"bar","baz":"..."}}' | | program:foo program:baz # docker exec database sonic-cfggen \ -j /var/run/redis/sonic-db/database_config.json \ -t /usr/share/sonic/templates/critical_processes.j2.old program:redisprogram:redis_bmp After: $ j2 ./dockers/docker-database/critical_processes.j2 -f json \ <<< '{"INSTANCES":{"foo":"bar","baz":"..."}}' program:foo program:baz # docker exec database sonic-cfggen \ -j /var/run/redis/sonic-db/database_config.json \ -t /usr/share/sonic/templates/critical_processes.j2 program:redis program:redis_bmp | After this fix, the output in /etc/supervisor/critical_processes is correct and the error from docker-database is gone.
mssonicbld
pushed a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Nov 22, 2024
…onic-net#20726) == Why I did it == Commit 06c469e added an extra redis instance. This resulted in a two item string without linefeeds in /etc/supervisor/critical_processes: program:redisprogram:redis_bmp That resulted in an error in syslog and docker-database failing. == Work item tracking == ERR database#supervisor-proc-exit-listener: Syntax of the line program:redisprogram:redis_bmp#012 in processes file is incorrect. Exiting... (sonic-net#20636) ossobv#17 == How I did it == Replace the jinja2 whitespace eating hyphens from BOL to EOL. Note that j2 and the jinja2 parser in sonig-cfggen do not behave the same. The sonig-cfggen is the relevant one. Before: $ j2 ./dockers/docker-database/critical_processes.j2.old -f json \ <<< '{"INSTANCES":{"foo":"bar","baz":"..."}}' | | program:foo program:baz # docker exec database sonic-cfggen \ -j /var/run/redis/sonic-db/database_config.json \ -t /usr/share/sonic/templates/critical_processes.j2.old program:redisprogram:redis_bmp After: $ j2 ./dockers/docker-database/critical_processes.j2 -f json \ <<< '{"INSTANCES":{"foo":"bar","baz":"..."}}' program:foo program:baz # docker exec database sonic-cfggen \ -j /var/run/redis/sonic-db/database_config.json \ -t /usr/share/sonic/templates/critical_processes.j2 program:redis program:redis_bmp | After this fix, the output in /etc/supervisor/critical_processes is correct and the error from docker-database is gone.
Collaborator
|
Cherry-pick PR to 202405: #20898 |
mssonicbld
pushed a commit
that referenced
this pull request
Dec 4, 2024
…20726) == Why I did it == Commit 06c469e added an extra redis instance. This resulted in a two item string without linefeeds in /etc/supervisor/critical_processes: program:redisprogram:redis_bmp That resulted in an error in syslog and docker-database failing. == Work item tracking == ERR database#supervisor-proc-exit-listener: Syntax of the line program:redisprogram:redis_bmp#012 in processes file is incorrect. Exiting... (#20636) ossobv#17 == How I did it == Replace the jinja2 whitespace eating hyphens from BOL to EOL. Note that j2 and the jinja2 parser in sonig-cfggen do not behave the same. The sonig-cfggen is the relevant one. Before: $ j2 ./dockers/docker-database/critical_processes.j2.old -f json \ <<< '{"INSTANCES":{"foo":"bar","baz":"..."}}' | | program:foo program:baz # docker exec database sonic-cfggen \ -j /var/run/redis/sonic-db/database_config.json \ -t /usr/share/sonic/templates/critical_processes.j2.old program:redisprogram:redis_bmp After: $ j2 ./dockers/docker-database/critical_processes.j2 -f json \ <<< '{"INSTANCES":{"foo":"bar","baz":"..."}}' program:foo program:baz # docker exec database sonic-cfggen \ -j /var/run/redis/sonic-db/database_config.json \ -t /usr/share/sonic/templates/critical_processes.j2 program:redis program:redis_bmp | After this fix, the output in /etc/supervisor/critical_processes is correct and the error from docker-database is gone.
mssonicbld
added
Included in 202405 Branch
and removed
Created PR to 202405 Branch
labels
VladimirKuk
pushed a commit
to Marvell-switching/sonic-buildimage
that referenced
this pull request
Jan 21, 2025
…onic-net#20726) == Why I did it == Commit 06c469e added an extra redis instance. This resulted in a two item string without linefeeds in /etc/supervisor/critical_processes: program:redisprogram:redis_bmp That resulted in an error in syslog and docker-database failing. == Work item tracking == ERR database#supervisor-proc-exit-listener: Syntax of the line program:redisprogram:redis_bmp#012 in processes file is incorrect. Exiting... (sonic-net#20636) ossobv#17 == How I did it == Replace the jinja2 whitespace eating hyphens from BOL to EOL. Note that j2 and the jinja2 parser in sonig-cfggen do not behave the same. The sonig-cfggen is the relevant one. Before: $ j2 ./dockers/docker-database/critical_processes.j2.old -f json \ <<< '{"INSTANCES":{"foo":"bar","baz":"..."}}' | | program:foo program:baz # docker exec database sonic-cfggen \ -j /var/run/redis/sonic-db/database_config.json \ -t /usr/share/sonic/templates/critical_processes.j2.old program:redisprogram:redis_bmp After: $ j2 ./dockers/docker-database/critical_processes.j2 -f json \ <<< '{"INSTANCES":{"foo":"bar","baz":"..."}}' program:foo program:baz # docker exec database sonic-cfggen \ -j /var/run/redis/sonic-db/database_config.json \ -t /usr/share/sonic/templates/critical_processes.j2 program:redis program:redis_bmp | After this fix, the output in /etc/supervisor/critical_processes is correct and the error from docker-database is gone.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why I did it
Commit 06c469e added an extra redis instance. This resulted in a two item string without linefeeds in /etc/supervisor/critical_processes:
That resulted in an error in syslog and docker-database failing.
Work item tracking
ERR database#supervisor-proc-exit-listener: Syntax of the line
program:redisprogram:redis_bmp#012 in processes file is incorrect.
Exiting... (#20636)
ossobv#17
How I did it
Replace the jinja2 whitespace eating hyphens from BOL to EOL.
Note that j2 and the jinja2 parser in sonig-cfggen do not behave the same. The sonig-cfggen is the relevant one.
Before:
After:
After this fix, the output in /etc/supervisor/critical_processes is correct and the error from docker-database is gone.