[docker-syncd-brcm] [docker-syncd-mlnx]: Properly manage syncd with supervisord #585
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,122 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Based on /etc/init.d/syncd | ||
|
|
||
| CMD_SYNCD=/usr/bin/syncd | ||
|
|
||
| CMD_DSSERVE=/usr/bin/dsserve | ||
| CMD_DSSERVE_ARGS="$CMD_SYNCD --diag" | ||
|
|
||
| ENABLE_SAITHRIFT=0 | ||
|
|
||
| PLATFORM_DIR=/usr/share/sonic/platform | ||
| HWSKU_DIR=/usr/share/sonic/hwsku | ||
|
|
||
| if [ -x $CMD_DSSERVE ]; then | ||
| CMD=$CMD_DSSERVE | ||
| CMD_ARGS=$CMD_DSSERVE_ARGS | ||
| else | ||
| CMD=$CMD_SYNCD | ||
| fi | ||
|
|
||
| parse_yaml() { | ||
| local prefix=$2 | ||
| local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @|tr @ '\034') | ||
| sed -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \ | ||
| -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p" $1 | | ||
| awk -F$fs '{ | ||
| indent = length($1)/2; | ||
| vname[indent] = $2; | ||
| for (i in vname) {if (i > indent) {delete vname[i]}} | ||
| if (length($3) > 0) { | ||
| vn=""; for (i=0; i<indent; i++) {vn=(vn)(vname[i])("_")} | ||
| printf("%s%s%s=\"%s\"\n", "'$prefix'",vn, $2, $3); | ||
| } | ||
| }' | ||
| } | ||
|
|
||
| start_bcm() | ||
| { | ||
| [ -e /dev/linux-bcm-knet ] || mknod /dev/linux-bcm-knet c 122 0 | ||
| [ -e /dev/linux-user-bde ] || mknod /dev/linux-user-bde c 126 0 | ||
| [ -e /dev/linux-kernel-bde ] || mknod /dev/linux-kernel-bde c 127 0 | ||
| } | ||
|
|
||
| start_mlnx() | ||
|
There was a problem hiding this comment. this is for mellanox platform. can we consider to still put this syncd.sh into the sairedis repo? There was a problem hiding this comment. Is it also possible to take common parts to separate script so that it will be easier to maintain init.d and supervisord all at once? |
||
| { | ||
| [ -e /dev/sxdevs/sxcdev ] || ( mkdir -p /dev/sxdevs && mknod /dev/sxdevs/sxcdev c 231 193 ) | ||
|
|
||
| # Read MAC address and align the last 6 bits. | ||
| MAC_ADDRESS=`ip link show eth0 | grep ether | awk '{print $2}'` | ||
| last_byte=`python -c "print '$MAC_ADDRESS'[-2:]"` | ||
| aligned_last_byte=`python -c "print format(int(int('$last_byte', 16) & 0b11000000), '02x')"` # put mask and take away the 0x prefix | ||
| ALIGNED_MAC_ADDRESS=`python -c "print '$MAC_ADDRESS'[:-2] + '$aligned_last_byte'"` # put aligned byte into the end of MAC | ||
|
|
||
| # Write MAC address into /tmp/profile file. | ||
| cat $HWSKU_DIR/sai.profile > /tmp/sai.profile | ||
| echo "DEVICE_MAC_ADDRESS=$ALIGNED_MAC_ADDRESS" >> /tmp/sai.profile | ||
| } | ||
|
|
||
| start_centec() | ||
| { | ||
| [ -e /dev/linux_dal ] || mknod /dev/linux_dal c 198 0 | ||
| [ -e /dev/net/tun ] || ( mkdir -p /dev/net && mknod /dev/net/tun c 10 200 ) | ||
|
|
||
| # Read MAC address and align the last 6 bits. | ||
| MAC_ADDRESS=`ip link show eth0 | grep ether | awk '{print $2}'` | ||
| last_byte=`python -c "print '$MAC_ADDRESS'[-2:]"` | ||
| aligned_last_byte=`python -c "print format(int(int('$last_byte', 16) & 0b11000000), '02x')"` # put mask and take away the 0x prefix | ||
| ALIGNED_MAC_ADDRESS=`python -c "print '$MAC_ADDRESS'[:-2] + '$aligned_last_byte'"` # put aligned byte into the end of MAC | ||
|
|
||
| # Write MAC address into /tmp/profile file. | ||
|
|
||
| # Write MAC address into /tmp/profile file. | ||
| cat $HWSKU_DIR/sai.profile > /tmp/sai.profile | ||
| echo "DEVICE_MAC_ADDRESS=$ALIGNED_MAC_ADDRESS" >> /tmp/sai.profile | ||
| } | ||
|
|
||
| start_cavium() | ||
| { | ||
| export XP_ROOT=/usr/bin/ | ||
| } | ||
|
|
||
| case "$(cat /proc/cmdline)" in | ||
| *fast-reboot*) | ||
| FAST_REBOOT='yes' | ||
| ;; | ||
| *) | ||
| FAST_REBOOT='no' | ||
| ;; | ||
| esac | ||
|
|
||
| eval $(parse_yaml /etc/sonic/sonic_version.yml "sonic_") | ||
|
|
||
| if [ $sonic_asic_type == "broadcom" ]; then | ||
| start_bcm | ||
| CMD_ARGS+=" -p $HWSKU_DIR/sai.profile " | ||
| if [ $FAST_REBOOT == "yes" ]; | ||
| then | ||
| CMD_ARGS+=" -t fast " | ||
| fi | ||
| elif [ $sonic_asic_type == "mellanox" ]; then | ||
| start_mlnx | ||
| CMD_ARGS+=" -p /tmp/sai.profile " | ||
| elif [ $sonic_asic_type == "cavium" ]; then | ||
| CMD_ARGS+=" -p $HWSKU_DIR/sai.profile " | ||
| start_cavium | ||
| elif [ $sonic_asic_type == "centec" ]; then | ||
| start_centec | ||
| CMD_ARGS+=" -p /tmp/sai.profile " | ||
| else | ||
| echo "Unknown asic type $sonic_asic_type" | ||
| exit 1 | ||
| fi | ||
|
|
||
| if [ ${ENABLE_SAITHRIFT} == 1 ]; then | ||
| CMD_ARGS+=" -r -m $HWSKU_DIR/port_config.ini" | ||
| fi | ||
|
|
||
| [ -r $PLATFORM_DIR/syncd.conf ] && . $PLATFORM_DIR/syncd.conf | ||
|
|
||
| exec ${CMD} ${CMD_ARGS} | ||
|
|
||
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 |
|---|---|---|
| @@ -1,19 +1,122 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Based on /etc/init.d/syncd | ||
|
|
||
| CMD_SYNCD=/usr/bin/syncd | ||
|
|
||
| CMD_DSSERVE=/usr/bin/dsserve | ||
| CMD_DSSERVE_ARGS="$CMD_SYNCD --diag" | ||
|
|
||
| ENABLE_SAITHRIFT=0 | ||
|
|
||
| PLATFORM_DIR=/usr/share/sonic/platform | ||
| HWSKU_DIR=/usr/share/sonic/hwsku | ||
|
|
||
| if [ -x $CMD_DSSERVE ]; then | ||
| CMD=$CMD_DSSERVE | ||
| CMD_ARGS=$CMD_DSSERVE_ARGS | ||
| else | ||
| CMD=$CMD_SYNCD | ||
| fi | ||
|
|
||
| parse_yaml() { | ||
| local prefix=$2 | ||
| local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @|tr @ '\034') | ||
| sed -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \ | ||
| -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p" $1 | | ||
| awk -F$fs '{ | ||
| indent = length($1)/2; | ||
| vname[indent] = $2; | ||
| for (i in vname) {if (i > indent) {delete vname[i]}} | ||
| if (length($3) > 0) { | ||
| vn=""; for (i=0; i<indent; i++) {vn=(vn)(vname[i])("_")} | ||
| printf("%s%s%s=\"%s\"\n", "'$prefix'",vn, $2, $3); | ||
| } | ||
| }' | ||
| } | ||
|
|
||
| start_bcm() | ||
| { | ||
| [ -e /dev/linux-bcm-knet ] || mknod /dev/linux-bcm-knet c 122 0 | ||
| [ -e /dev/linux-user-bde ] || mknod /dev/linux-user-bde c 126 0 | ||
| [ -e /dev/linux-kernel-bde ] || mknod /dev/linux-kernel-bde c 127 0 | ||
| } | ||
|
|
||
| start_mlnx() | ||
| { | ||
| [ -e /dev/sxdevs/sxcdev ] || ( mkdir -p /dev/sxdevs && mknod /dev/sxdevs/sxcdev c 231 193 ) | ||
|
|
||
| # Read MAC address and align the last 6 bits. | ||
| MAC_ADDRESS=`ip link show eth0 | grep ether | awk '{print $2}'` | ||
| last_byte=`python -c "print '$MAC_ADDRESS'[-2:]"` | ||
| aligned_last_byte=`python -c "print format(int(int('$last_byte', 16) & 0b11000000), '02x')"` # put mask and take away the 0x prefix | ||
| ALIGNED_MAC_ADDRESS=`python -c "print '$MAC_ADDRESS'[:-2] + '$aligned_last_byte'"` # put aligned byte into the end of MAC | ||
|
|
||
| # Write MAC address into /tmp/profile file. | ||
| cat $HWSKU_DIR/sai.profile > /tmp/sai.profile | ||
| echo "DEVICE_MAC_ADDRESS=$ALIGNED_MAC_ADDRESS" >> /tmp/sai.profile | ||
| } | ||
|
|
||
| start_centec() | ||
| { | ||
| [ -e /dev/linux_dal ] || mknod /dev/linux_dal c 198 0 | ||
| [ -e /dev/net/tun ] || ( mkdir -p /dev/net && mknod /dev/net/tun c 10 200 ) | ||
|
|
||
| # Read MAC address and align the last 6 bits. | ||
| MAC_ADDRESS=`ip link show eth0 | grep ether | awk '{print $2}'` | ||
| last_byte=`python -c "print '$MAC_ADDRESS'[-2:]"` | ||
| aligned_last_byte=`python -c "print format(int(int('$last_byte', 16) & 0b11000000), '02x')"` # put mask and take away the 0x prefix | ||
| ALIGNED_MAC_ADDRESS=`python -c "print '$MAC_ADDRESS'[:-2] + '$aligned_last_byte'"` # put aligned byte into the end of MAC | ||
|
|
||
| # Write MAC address into /tmp/profile file. | ||
|
|
||
| # Write MAC address into /tmp/profile file. | ||
| cat $HWSKU_DIR/sai.profile > /tmp/sai.profile | ||
| echo "DEVICE_MAC_ADDRESS=$ALIGNED_MAC_ADDRESS" >> /tmp/sai.profile | ||
| } | ||
|
|
||
| start_cavium() | ||
| { | ||
| export XP_ROOT=/usr/bin/ | ||
| } | ||
|
|
||
| case "$(cat /proc/cmdline)" in | ||
| *fast-reboot*) | ||
| FAST_REBOOT='yes' | ||
| ;; | ||
| *) | ||
| FAST_REBOOT='no' | ||
| ;; | ||
| esac | ||
|
|
||
| eval $(parse_yaml /etc/sonic/sonic_version.yml "sonic_") | ||
|
|
||
| if [ $sonic_asic_type == "broadcom" ]; then | ||
| start_bcm | ||
| CMD_ARGS+=" -p $HWSKU_DIR/sai.profile " | ||
| if [ $FAST_REBOOT == "yes" ]; | ||
| then | ||
| CMD_ARGS+=" -t fast " | ||
| fi | ||
| elif [ $sonic_asic_type == "mellanox" ]; then | ||
| start_mlnx | ||
| CMD_ARGS+=" -p /tmp/sai.profile " | ||
| elif [ $sonic_asic_type == "cavium" ]; then | ||
| CMD_ARGS+=" -p $HWSKU_DIR/sai.profile " | ||
| start_cavium | ||
| elif [ $sonic_asic_type == "centec" ]; then | ||
| start_centec | ||
| CMD_ARGS+=" -p /tmp/sai.profile " | ||
| else | ||
| echo "Unknown asic type $sonic_asic_type" | ||
| exit 1 | ||
| fi | ||
|
|
||
| if [ ${ENABLE_SAITHRIFT} == 1 ]; then | ||
| CMD_ARGS+=" -r -m $HWSKU_DIR/port_config.ini" | ||
| fi | ||
|
|
||
| [ -r $PLATFORM_DIR/syncd.conf ] && . $PLATFORM_DIR/syncd.conf | ||
|
|
||
| exec ${CMD} ${CMD_ARGS} | ||
|
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it possible to use sonic-cfggen instead?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be better, however, the syncd dockers are currently built from docker-base, not docker-config-engine, so they don't have sonic-cfggen available. I plan to create a new PR that will do this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think we could replace the docker-base with docker-config-engine.