-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Separate syncd service from swss service (#2051)
* [swss.sh] refactor ssh service script code
- Move checks and waits to helper functions.
- Remove early returns from code stream
Signed-off-by: Ying Xie <ying.xie@microsoft.com>
* [swss.sh] Add debug log for service state changes
Signed-off-by: Ying Xie <ying.xie@microsoft.com>
* [syncd] Separate out syncd service from swss service
Still make them start/stop/restart synchronously so existing scripts
continue working.
Signed-off-by: Ying Xie <ying.xie@microsoft.com>
* Remove extra 'After' in swss service and remove syncd docker warm boot code
Syncd warm boot needs more thinking, we can put it back once the work
flow has been defined and ready for coding/testing.
* [syncd] syncd start/stop/restart shouldn't affect swss state
Semi-detach syncd service state change from swss:
- swss state change still chase syncd service to follow except warm boot
- syncd state change will only affect itself.
Signed-off-by: Ying Xie <ying.xie@microsoft.com>
* add missing '{'- Loading branch information
Showing
5 changed files
with
242 additions
and
57 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| [Unit] | ||
| Description=syncd service | ||
| Requires=database.service updategraph.service | ||
| {% if sonic_asic_platform == 'broadcom' %} | ||
| Requires=opennsl-modules-4.9.0-7-amd64.service | ||
| {% elif sonic_asic_platform == 'nephos' %} | ||
| Requires=nps-modules-4.9.0-7-amd64.service | ||
| {% endif %} | ||
| After=database.service updategraph.service | ||
| After=interfaces-config.service | ||
| {% if sonic_asic_platform == 'broadcom' %} | ||
| After=opennsl-modules-4.9.0-7-amd64.service | ||
| {% elif sonic_asic_platform == 'nephos' %} | ||
| After=nps-modules-4.9.0-7-amd64.service | ||
| {% endif %} | ||
|
|
||
| [Service] | ||
| User=root | ||
| Environment=sonic_asic_platform={{ sonic_asic_platform }} | ||
| ExecStart=/usr/local/bin/syncd.sh start | ||
| ExecStop=/usr/local/bin/syncd.sh stop | ||
|
|
||
| [Install] | ||
| WantedBy=multi-user.target |
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| #!/bin/bash | ||
|
|
||
| SERVICE="syncd" | ||
| PEER="swss" | ||
| DEBUGLOG="/tmp/swss-syncd-debug.log" | ||
| LOCKFILE="/tmp/swss-syncd-lock" | ||
|
|
||
| function debug() | ||
| { | ||
| /bin/echo `date` "- $1" >> ${DEBUGLOG} | ||
| } | ||
|
|
||
| function lock_service_state_change() | ||
| { | ||
| debug "Locking ${LOCKFILE} from ${SERVICE} service" | ||
|
|
||
| exec {LOCKFD}>${LOCKFILE} | ||
| /usr/bin/flock -x ${LOCKFD} | ||
| trap "/usr/bin/flock -u ${LOCKFD}" 0 2 3 15 | ||
|
|
||
| debug "Locked ${LOCKFILE} (${LOCKFD}) from ${SERVICE} service" | ||
| } | ||
|
|
||
| function unlock_service_state_change() | ||
| { | ||
| debug "Unlocking ${LOCKFILE} (${LOCKFD}) from ${SERVICE} service" | ||
| /usr/bin/flock -u ${LOCKFD} | ||
| } | ||
|
|
||
| function check_warm_boot() | ||
| { | ||
| SYSTEM_WARM_START=`/usr/bin/redis-cli -n 4 hget "WARM_RESTART|system" enable` | ||
| # SYSTEM_WARM_START could be empty, always make WARM_BOOT meaningful. | ||
| if [[ x"$SYSTEM_WARM_START" == x"true" ]]; then | ||
| WARM_BOOT="true" | ||
| else | ||
| WARM_BOOT="false" | ||
| fi | ||
| } | ||
|
|
||
| function wait_for_database_service() | ||
| { | ||
| # Wait for redis server start before database clean | ||
| until [[ $(/usr/bin/docker exec database redis-cli ping | grep -c PONG) -gt 0 ]]; | ||
| do sleep 1; | ||
| done | ||
|
|
||
| # Wait for configDB initialization | ||
| until [[ $(/usr/bin/docker exec database redis-cli -n 4 GET "CONFIG_DB_INITIALIZED") ]]; | ||
| do sleep 1; | ||
| done | ||
| } | ||
|
|
||
| start() { | ||
| debug "Starting ${SERVICE} service..." | ||
|
|
||
| lock_service_state_change | ||
|
|
||
| wait_for_database_service | ||
| check_warm_boot | ||
|
|
||
| debug "Warm boot flag: ${SERVICE} ${WARM_BOOT}." | ||
|
|
||
| # Don't flush DB during warm boot | ||
| if [[ x"$WARM_BOOT" != x"true" ]]; then | ||
| /usr/bin/docker exec database redis-cli -n 1 FLUSHDB | ||
|
|
||
| # platform specific tasks | ||
| if [ x$sonic_asic_platform == x'mellanox' ]; then | ||
| FAST_BOOT=1 | ||
| /usr/bin/mst start | ||
| /usr/bin/mlnx-fw-upgrade.sh | ||
| /etc/init.d/sxdkernel start | ||
| /sbin/modprobe i2c-dev | ||
| /etc/mlnx/mlnx-hw-management start | ||
| elif [ x$sonic_asic_platform == x'cavium' ]; then | ||
| /etc/init.d/xpnet.sh start | ||
| fi | ||
| fi | ||
|
|
||
| # start service docker | ||
| /usr/bin/${SERVICE}.sh start | ||
| debug "Started ${SERVICE} service..." | ||
|
|
||
| unlock_service_state_change | ||
| /usr/bin/${SERVICE}.sh attach | ||
| } | ||
|
|
||
| stop() { | ||
| debug "Stopping ${SERVICE} service..." | ||
|
|
||
| lock_service_state_change | ||
| check_warm_boot | ||
| debug "Warm boot flag: ${SERVICE} ${WARM_BOOT}." | ||
|
|
||
| /usr/bin/${SERVICE}.sh stop | ||
| debug "Stopped ${SERVICE} service..." | ||
|
|
||
| # if warm start enabled, don't stop peer service docker | ||
| if [[ x"$WARM_BOOT" != x"true" ]]; then | ||
| # platform specific tasks | ||
| if [ x$sonic_asic_platform == x'mellanox' ]; then | ||
| /etc/mlnx/mlnx-hw-management stop | ||
| /etc/init.d/sxdkernel stop | ||
| /usr/bin/mst stop | ||
| elif [ x$sonic_asic_platform == x'cavium' ]; then | ||
| /etc/init.d/xpnet.sh stop | ||
| /etc/init.d/xpnet.sh start | ||
| fi | ||
| fi | ||
|
|
||
| unlock_service_state_change | ||
| } | ||
|
|
||
| case "$1" in | ||
| start|stop) | ||
| $1 | ||
| ;; | ||
| *) | ||
| echo "Usage: $0 {start|stop}" | ||
| exit 1 | ||
| ;; | ||
| esac |