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

[docker-platform-monitor] make file and supervisord conf change for new xcvrd deamon #1840

Merged
merged 3 commits into from
Aug 3, 2018
Merged

[docker-platform-monitor] make file and supervisord conf change for new xcvrd deamon #1840

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
054b2e4
[docker-platform-monitor] make file and supervisord conf change for n…
keboliu Jul 3, 2018
486bf8f
make xcvrd start sequence aligned with the supervisord conf
keboliu Jul 4, 2018
13e2276
update submodules to include xcvrd modification
Aug 3, 2018
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
2 changes: 2 additions & 0 deletions dockers/docker-platform-monitor/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ if [ -e /usr/share/sonic/platform/fancontrol ]; then
fi

supervisorctl start ledd

supervisorctl start xcvrd
9 changes: 9 additions & 0 deletions dockers/docker-platform-monitor/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,12 @@ autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
startsecs=0

[program:xcvrd]
command=/usr/bin/xcvrd
priority=6
Copy link
Contributor

Choose a reason for hiding this comment

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

I try to align the priority with the order in which we'd like the applications to start. Because supervisor doesn't handle sequential starting properly, we start our programs in the start.sh script. There, you have xcvrd starting after rsyslogd. Please adjust one of the files so that they are in agreement.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

move xcvrd to be started after ledd in start.sh

autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
startsecs=0
2 changes: 1 addition & 1 deletion rules/docker-platform-monitor.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

DOCKER_PLATFORM_MONITOR = docker-platform-monitor.gz
$(DOCKER_PLATFORM_MONITOR)_PATH = $(DOCKERS_PATH)/docker-platform-monitor
$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(SONIC_LEDD)
$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(SONIC_LEDD) $(SONIC_XCVRD)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SWSSSDK_PY2)
$(DOCKER_PLATFORM_MONITOR)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE)
Expand Down
5 changes: 5 additions & 0 deletions rules/sonic-xcvrd.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# sonic-xcvrd (SONiC Transceiver monitoring daemon) Debian package

SONIC_XCVRD = python-sonic-xcvrd_1.0-1_all.deb
$(SONIC_XCVRD)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-xcvrd
SONIC_PYTHON_STDEB_DEBS += $(SONIC_XCVRD)