Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skip CMIS manager #10907

Merged
merged 4 commits into from
Jun 22, 2022
Merged

Skip CMIS manager #10907

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d987f2
Removed unwanted changes
prgeor May 23, 2022
f75a831
Fix j2 compilation error
prgeor Jun 7, 2022
c32cd70
Address review comment
prgeor Jun 13, 2022
48571b8
Add newline
prgeor Jun 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,11 @@ dependent_startup_wait_for=rsyslogd:running
{% if not skip_xcvrd %}
[program:xcvrd]
{% if delay_xcvrd %}
command=bash -c "sleep 30 && {% if API_VERSION == 3 and 'xcvrd' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/xcvrd"
command={% if skip_xcvrd_cmis_mgr %} bash -c "sleep 30 && python3 /usr/local/bin/xcvrd --skip_cmis_mgr" {% else %} bash -c "sleep 30 && python3 /usr/local/bin/xcvrd" {% endif %}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@prgeor
skip_xcvrd_cmis_mgr is set in platform_daemon_control.json file and in turn used by supervisord to spawn xcvrd with --skip_cmis_mgr as an arg.
So, better to make the variable name same at both places (producer/setter and consumer)

{% else %}
command={% if API_VERSION == 3 and 'xcvrd' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/xcvrd
command={% if skip_xcvrd_cmis_mgr %} python3 /usr/local/bin/xcvrd --skip_cmis_mgr {% else %} python3 /usr/local/bin/xcvrd {% endif %}

{% endif %}
priority=6
autostart=false
Expand Down