Skip to content

Commit

Permalink
[swss]: flush asic db in swss.sh for non warm-boot (sonic-net#2582)
Browse files Browse the repository at this point in the history
need to flush asic db in swss.sh instead of syncd.sh

orchagent might already started in swss.sh and put commands
into asic db before asic db is flushed in syncd.sh. This
causes race condition such as INIT_VIEW not passing to syncd.

Signed-off-by: Guohan Lu <gulv@microsoft.com>
  • Loading branch information
lguohan authored and tiantianlv committed Apr 10, 2019
1 parent 2e7c760 commit 8366375
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 2 additions & 1 deletion files/scripts/swss.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,9 @@ start() {

# Don't flush DB during warm boot
if [[ x"$WARM_BOOT" != x"true" ]]; then
debug "Flushing databases ..."
debug "Flushing APP, ASIC, COUNTER, CONFIG, and partial STATE databases ..."
/usr/bin/docker exec database redis-cli -n 0 FLUSHDB
/usr/bin/docker exec database redis-cli -n 1 FLUSHDB
/usr/bin/docker exec database redis-cli -n 2 FLUSHDB
/usr/bin/docker exec database redis-cli -n 5 FLUSHDB
clean_up_tables 6 "'PORT_TABLE*', 'MGMT_PORT_TABLE*', 'VLAN_TABLE*', 'VLAN_MEMBER_TABLE*', 'INTERFACE_TABLE*', 'MIRROR_SESSION*', 'VRF_TABLE*'"
Expand Down
4 changes: 0 additions & 4 deletions files/scripts/syncd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,6 @@ start() {
touch /host/warmboot/warm-starting
else
rm -f /host/warmboot/warm-starting

# Flush ASIC DB during non-warm start
debug "Flushing ASIC database ..."
/usr/bin/docker exec database redis-cli -n 1 FLUSHDB
fi

# platform specific tasks
Expand Down

0 comments on commit 8366375

Please sign in to comment.