Move stop notifications thread after remove switch (sonic-net#401)

kcudnik · yxieca · commit ebd8dfc086c9 · 2018-12-18T09:47:01.000-08:00
* Move stop notifications trhead after remove switch

* Remove stop notifications processing thread from pre shutdown
diff --git a/syncd/syncd.cpp b/syncd/syncd.cpp
@@ -3681,7 +3681,6 @@ int syncd_main(int argc, char **argv)
                 SWSS_LOG_TIMER("warm pre-shutdown");
 
                 FlexCounter::removeAllCounters();
-                stopNotificationsProcessingThread();
 
                 sai_attribute_t attr;
 
@@ -3814,14 +3813,14 @@ int syncd_main(int argc, char **argv)
 
     FlexCounter::removeAllCounters();
 
-    // Stop notification thread before removing switch
-    stopNotificationsProcessingThread();
-
     {
         SWSS_LOG_TIMER("remove switch");
         status = sai_switch_api->remove_switch(gSwitchId);
     }
 
+    // Stop notification thread after removing switch
+    stopNotificationsProcessingThread();
+
     if (status != SAI_STATUS_SUCCESS)
     {
         SWSS_LOG_NOTICE("Can't delete a switch. gSwitchId=0x%lx status=%s", gSwitchId,

Original file line number	Diff line number	Diff line change
`@@ -3681,7 +3681,6 @@ int syncd_main(int argc, char **argv)`
`3681`	`3681`	`SWSS_LOG_TIMER("warm pre-shutdown");`
`3682`	`3682`
`3683`	`3683`	`FlexCounter::removeAllCounters();`
`3684`		`- stopNotificationsProcessingThread();`
`3685`	`3684`
`3686`	`3685`	`sai_attribute_t attr;`
`3687`	`3686`
`@@ -3814,14 +3813,14 @@ int syncd_main(int argc, char **argv)`
`3814`	`3813`
`3815`	`3814`	`FlexCounter::removeAllCounters();`
`3816`	`3815`
`3817`		`- // Stop notification thread before removing switch`
`3818`		`- stopNotificationsProcessingThread();`
`3819`		`-`
`3820`	`3816`	`{`
`3821`	`3817`	`SWSS_LOG_TIMER("remove switch");`
`3822`	`3818`	`status = sai_switch_api->remove_switch(gSwitchId);`
`3823`	`3819`	`}`
`3824`	`3820`
	`3821`	`+ // Stop notification thread after removing switch`
	`3822`	`+ stopNotificationsProcessingThread();`
	`3823`	`+`
`3825`	`3824`	`if (status != SAI_STATUS_SUCCESS)`
`3826`	`3825`	`{`
`3827`	`3826`	`SWSS_LOG_NOTICE("Can't delete a switch. gSwitchId=0x%lx status=%s", gSwitchId,`