From 767fcda1a91e33fa885dca83c20e03faa8bb5a82 Mon Sep 17 00:00:00 2001 From: lguohan Date: Tue, 19 Feb 2019 21:48:43 -0800 Subject: [PATCH] [swss]: flush asic db in swss.sh for non warm-boot (#2582) 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 --- files/scripts/swss.sh | 3 ++- files/scripts/syncd.sh | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/files/scripts/swss.sh b/files/scripts/swss.sh index d3e789d53afc..f7f2e53608f4 100755 --- a/files/scripts/swss.sh +++ b/files/scripts/swss.sh @@ -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*'" diff --git a/files/scripts/syncd.sh b/files/scripts/syncd.sh index 0c80e4521a00..545879b2f7f4 100755 --- a/files/scripts/syncd.sh +++ b/files/scripts/syncd.sh @@ -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