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

* Move stop notifications trhead after remove switch * Remove stop notifications processing thread from pre shutdown
dmytroxshevchuk · Dec 18, 2018 · ebd8dfc · ebd8dfc
1 parent bb3ff64
commit ebd8dfc
Showing 1 changed file with 3 additions and 4 deletions.
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,