From e066274c42c49267cbf7a7786ba32dd32acdc52a Mon Sep 17 00:00:00 2001 From: Bing Sun Date: Tue, 3 Mar 2020 12:35:07 -0800 Subject: [PATCH 1/3] upon cold reboot, skip remove mgmt vrf table from the kernel --- cfgmgr/vrfmgr.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cfgmgr/vrfmgr.cpp b/cfgmgr/vrfmgr.cpp index f0db83a04d..759816ba86 100644 --- a/cfgmgr/vrfmgr.cpp +++ b/cfgmgr/vrfmgr.cpp @@ -67,6 +67,13 @@ VrfMgr::VrfMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, con } else { + // No deletion of mgmt table from kernel + if (vrfName.compare("mgmt") ==0) { + SWSS_LOG_NOTICE("Skipping remove vrf device %s", vrfName.c_str()); + rowType = LINK_ROW; + break; + } + SWSS_LOG_NOTICE("Remove vrf device %s", vrfName.c_str()); cmd.str(""); cmd.clear(); From 24b6d839436257de6bc90b8bcb08b82bdd1018be Mon Sep 17 00:00:00 2001 From: Bing Sun Date: Tue, 3 Mar 2020 21:12:43 -0800 Subject: [PATCH 2/3] move { to new line --- cfgmgr/vrfmgr.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cfgmgr/vrfmgr.cpp b/cfgmgr/vrfmgr.cpp index 759816ba86..36cedf4297 100644 --- a/cfgmgr/vrfmgr.cpp +++ b/cfgmgr/vrfmgr.cpp @@ -68,7 +68,8 @@ VrfMgr::VrfMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, con else { // No deletion of mgmt table from kernel - if (vrfName.compare("mgmt") ==0) { + if (vrfName.compare("mgmt") ==0) + { SWSS_LOG_NOTICE("Skipping remove vrf device %s", vrfName.c_str()); rowType = LINK_ROW; break; From 81f14834607868a1c9619cc237a515fdd1091d51 Mon Sep 17 00:00:00 2001 From: Bing Sun Date: Wed, 4 Mar 2020 11:24:07 -0800 Subject: [PATCH 3/3] add space after == --- cfgmgr/vrfmgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfgmgr/vrfmgr.cpp b/cfgmgr/vrfmgr.cpp index 36cedf4297..25ca1253e3 100644 --- a/cfgmgr/vrfmgr.cpp +++ b/cfgmgr/vrfmgr.cpp @@ -68,7 +68,7 @@ VrfMgr::VrfMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, con else { // No deletion of mgmt table from kernel - if (vrfName.compare("mgmt") ==0) + if (vrfName.compare("mgmt") == 0) { SWSS_LOG_NOTICE("Skipping remove vrf device %s", vrfName.c_str()); rowType = LINK_ROW;