Add OA switch_shutdown_request notification on syncd exit (sonic-net#62)

kcudnik · web-flow · commit b60a1c1e40d9 · 2016-08-22T10:37:17.000-07:00
diff --git a/syncd/syncd.cpp b/syncd/syncd.cpp
@@ -11,6 +11,35 @@ std::map<std::string, std::string> gProfileMap;
 
 bool g_veryFirstRun = false;
 
+void exit_and_notify(int status)
+{
+    SWSS_LOG_ENTER();
+
+    try
+    {
+        if (notifications != NULL)
+        {
+            std::vector<swss::FieldValueTuple> entry;
+
+            SWSS_LOG_NOTICE("sending switch_shutdown_request notification to OA");
+
+            notifications->send("switch_shutdown_request", "", entry);
+
+            SWSS_LOG_NOTICE("notification send successfull");
+        }
+    }
+    catch(const std::exception &e)
+    {
+        SWSS_LOG_ERROR("Runtime error: %s", e.what());
+    }
+    catch(...)
+    {
+        SWSS_LOG_ERROR("Unknown runtime error");
+    }
+
+    exit(status);
+}
+
 void sai_diag_shell()
 {
     SWSS_LOG_ENTER();
@@ -87,8 +116,7 @@ sai_object_id_t translate_rid_to_vid(
     if (object_type == SAI_OBJECT_TYPE_NULL)
     {
         SWSS_LOG_ERROR("sai_object_type_query returned NULL type for RID %llx", rid);
-
-        exit(EXIT_FAILURE);
+        exit_and_notify(EXIT_FAILURE);
     }
 
     vid = redis_create_virtual_object_id(object_type);
@@ -135,8 +163,7 @@ void translate_rid_to_vid_list(
         if (status != SAI_STATUS_SUCCESS)
         {
             SWSS_LOG_ERROR("unable to find serialization type for object type %x, attribute %x", object_type, attr.id);
-
-            exit(EXIT_FAILURE);
+            exit_and_notify(EXIT_FAILURE);
         }
 
         switch (serialization_type)
@@ -195,8 +222,7 @@ sai_object_id_t translate_vid_to_rid(
     if (prid == NULL)
     {
         SWSS_LOG_ERROR("unable to get RID for VID: %s", str_vid.c_str());
-
-        exit(EXIT_FAILURE);
+        exit_and_notify(EXIT_FAILURE);
     }
 
     str_rid = *prid;
@@ -231,8 +257,7 @@ void translate_vid_to_rid_list(
         if (status != SAI_STATUS_SUCCESS)
         {
             SWSS_LOG_ERROR("unable to find serialization type for object type %x, attribute %x", object_type, attr.id);
-
-            exit(EXIT_FAILURE);
+            exit_and_notify(EXIT_FAILURE);
         }
 
         switch (serialization_type)
@@ -422,7 +447,7 @@ sai_status_t handle_generic(
                 if (create == NULL)
                 {
                     SWSS_LOG_ERROR("create function is not defined for object type %x", object_type);
-                    exit(EXIT_FAILURE);
+                    exit_and_notify(EXIT_FAILURE);
                 }
 
                 sai_object_id_t real_object_id;
@@ -461,7 +486,7 @@ sai_status_t handle_generic(
                 if (remove == NULL)
                 {
                     SWSS_LOG_ERROR("remove function is not defined for object type %x", object_type);
-                    exit(EXIT_FAILURE);
+                    exit_and_notify(EXIT_FAILURE);
                 }
 
                 sai_object_id_t rid = translate_vid_to_rid(object_id);
@@ -487,7 +512,7 @@ sai_status_t handle_generic(
                 if (set == NULL)
                 {
                     SWSS_LOG_ERROR("set function is not defined for object type %x", object_type);
-                    exit(EXIT_FAILURE);
+                    exit_and_notify(EXIT_FAILURE);
                 }
 
                 sai_object_id_t rid = translate_vid_to_rid(object_id);
@@ -504,7 +529,7 @@ sai_status_t handle_generic(
                 if (get == NULL)
                 {
                     SWSS_LOG_ERROR("get function is not defined for object type %x", object_type);
-                    exit(EXIT_FAILURE);
+                    exit_and_notify(EXIT_FAILURE);
                 }
 
                 sai_object_id_t rid = translate_vid_to_rid(object_id);
@@ -514,7 +539,7 @@ sai_status_t handle_generic(
 
         default:
             SWSS_LOG_ERROR("generic other apis not implemented");
-            exit(EXIT_FAILURE);
+            exit_and_notify(EXIT_FAILURE);
     }
 }
 
@@ -546,7 +571,7 @@ sai_status_t handle_fdb(
 
         default:
             SWSS_LOG_ERROR("fdb other apis not implemented");
-            exit(EXIT_FAILURE);
+            exit_and_notify(EXIT_FAILURE);
     }
 }
 
@@ -574,7 +599,7 @@ sai_status_t handle_switch(
 
         default:
             SWSS_LOG_ERROR("switch other apis not implemented");
-            exit(EXIT_FAILURE);
+            exit_and_notify(EXIT_FAILURE);
     }
 }
 
@@ -608,7 +633,7 @@ sai_status_t handle_neighbor(
 
         default:
             SWSS_LOG_ERROR("neighbor other apis not implemented");
-            exit(EXIT_FAILURE);
+            exit_and_notify(EXIT_FAILURE);
     }
 }
 
@@ -644,7 +669,7 @@ sai_status_t handle_route(
 
         default:
             SWSS_LOG_ERROR("route other apis not implemented");
-            exit(EXIT_FAILURE);
+            exit_and_notify(EXIT_FAILURE);
     }
 }
 
@@ -676,7 +701,7 @@ sai_status_t handle_vlan(
 
         default:
             SWSS_LOG_ERROR("vlan other apis not implemented");
-            exit(EXIT_FAILURE);
+            exit_and_notify(EXIT_FAILURE);
     }
 }
 
@@ -704,7 +729,7 @@ sai_status_t handle_trap(
 
         default:
             SWSS_LOG_ERROR("trap other apis not implemented");
-            exit(EXIT_FAILURE);
+            exit_and_notify(EXIT_FAILURE);
     }
 }
 
@@ -805,7 +830,7 @@ sai_status_t processEvent(swss::ConsumerTable &consumer)
     {
         SWSS_LOG_ERROR("failed to execute api: %s: %d", op.c_str(), status);
 
-        exit(EXIT_FAILURE);
+        exit_and_notify(EXIT_FAILURE);
     }
 
     return status;
@@ -1294,7 +1319,7 @@ int main(int argc, char **argv)
     if (status != SAI_STATUS_SUCCESS)
     {
         SWSS_LOG_ERROR("fail to sai_initialize_switch: %d", status);
-        exit(EXIT_FAILURE);
+        exit_and_notify(EXIT_FAILURE);
     }
 
 #ifdef BRCMSAI
@@ -1371,7 +1396,7 @@ int main(int argc, char **argv)
     {
         SWSS_LOG_ERROR("Runtime error: %s", e.what());
 
-        exit(EXIT_FAILURE);
+        exit_and_notify(EXIT_FAILURE);
     }
 
     endCountersThread();
diff --git a/syncd/syncd.h b/syncd/syncd.h
@@ -59,6 +59,8 @@ extern "C" {
 #define SWITCH_SAI_THRIFT_RPC_SERVER_PORT 9092
 #endif // SAITHRIFT
 
+extern void exit_and_notify(int status) __attribute__ ((__noreturn__));
+
 extern std::mutex g_mutex;
 
 void onSyncdStart(bool warmStart);
diff --git a/syncd/syncd_hard_reinit.cpp b/syncd/syncd_hard_reinit.cpp
@@ -44,7 +44,7 @@ sai_object_type_t getObjectTypeFromVid(sai_object_id_t sai_object_id)
     {
         SWSS_LOG_ERROR("invalid object type: %x on object id: %llx", objectType, sai_object_id);
 
-        exit(EXIT_FAILURE);
+        exit_and_notify(EXIT_FAILURE);
     }
 
     return objectType;
@@ -89,7 +89,7 @@ sai_object_type_t getObjectTypeFromAsicKey(const std::string &key)
     {
         SWSS_LOG_ERROR("invalid object type: %x on asic key: %s", objectType, key.c_str());
 
-        exit(EXIT_FAILURE);
+        exit_and_notify(EXIT_FAILURE);
     }
 
     return objectType;
@@ -134,7 +134,7 @@ void checkAllIds()
         {
             SWSS_LOG_ERROR("failed to find vid %llx in previous map", kv.first);
 
-            exit(EXIT_FAILURE);
+            exit_and_notify(EXIT_FAILURE);
         }
 
         g_vidToRidMap.erase(it);
@@ -151,7 +151,7 @@ void checkAllIds()
             SWSS_LOG_ERROR("vid not translated: %llx, object type: %llx", kv.first, objectType);
         }
 
-        exit(EXIT_FAILURE);
+        exit_and_notify(EXIT_FAILURE);
     }
 
     redisSetVidAndRidMap(g_translated);
@@ -257,7 +257,7 @@ sai_object_id_t processSingleVid(sai_object_id_t vid)
         {
             SWSS_LOG_ERROR("failed to find VID %llx in VIDTORID map", vid);
 
-            exit(EXIT_FAILURE);
+            exit_and_notify(EXIT_FAILURE);
         }
 
         sai_object_id_t virtualRouterRid = it->second;
@@ -288,7 +288,7 @@ sai_object_id_t processSingleVid(sai_object_id_t vid)
         {
             SWSS_LOG_ERROR("failed to find VID %llx in VIDTORID map", vid);
 
-            exit(EXIT_FAILURE);
+            exit_and_notify(EXIT_FAILURE);
         }
 
         rid = it->second;
@@ -304,7 +304,7 @@ sai_object_id_t processSingleVid(sai_object_id_t vid)
     {
         SWSS_LOG_ERROR("failed to find VID %s in OIDs map", strVid.c_str());
 
-        exit(EXIT_FAILURE);
+        exit_and_notify(EXIT_FAILURE);
     }
 
     std::string asicKey = oit->second;;
@@ -325,7 +325,7 @@ sai_object_id_t processSingleVid(sai_object_id_t vid)
         {
             SWSS_LOG_ERROR("create function is not defined for object type %llx", objectType);
 
-            exit(EXIT_FAILURE);
+            exit_and_notify(EXIT_FAILURE);
         }
 
         sai_status_t status = create(&rid, attrCount, attrList);
@@ -334,7 +334,7 @@ sai_object_id_t processSingleVid(sai_object_id_t vid)
         {
             SWSS_LOG_ERROR("failed to create object %llx: %d", objectType, status);
 
-            exit(EXIT_FAILURE);
+            exit_and_notify(EXIT_FAILURE);
         }
 
         SWSS_LOG_DEBUG("created object of type %x, processed VID %llx to RID %llx", objectType, vid, rid);
@@ -355,7 +355,7 @@ sai_object_id_t processSingleVid(sai_object_id_t vid)
             {
                 SWSS_LOG_ERROR("failed to set attribute for object type %llx attr id %llx: %d", objectType, attr->id, status);
 
-                exit(EXIT_FAILURE);
+                exit_and_notify(EXIT_FAILURE);
             }
         }
     }
@@ -376,7 +376,7 @@ sai_attr_serialization_type_t getSerializationType(sai_object_type_t objectType,
     {
         SWSS_LOG_ERROR("unable to find serialization type on object type %x and attr id %x", objectType, attrId);
 
-        exit(EXIT_FAILURE);
+        exit_and_notify(EXIT_FAILURE);
     }
 
     return serializationType;
@@ -505,7 +505,7 @@ void processSwitch()
             {
                 SWSS_LOG_ERROR("failed to set_switch_attribute %llx: %d", attr->id, status);
 
-                exit(EXIT_FAILURE);
+                exit_and_notify(EXIT_FAILURE);
             }
         }
     }
@@ -542,7 +542,7 @@ void processVlans()
             {
                 SWSS_LOG_ERROR("failed to create_vlan %d: %d", vlanId, status);
 
-                exit(EXIT_FAILURE);
+                exit_and_notify(EXIT_FAILURE);
             }
         }
 
@@ -564,7 +564,7 @@ void processVlans()
             {
                 SWSS_LOG_ERROR("failed to set_vlan_attribute %llx: %d", attr->id, status);
 
-                exit(EXIT_FAILURE);
+                exit_and_notify(EXIT_FAILURE);
             }
         }
     }
@@ -606,7 +606,7 @@ void processFdbs()
         {
             SWSS_LOG_ERROR("failed to create_fdb_entry: %d", status);
 
-            exit(EXIT_FAILURE);
+            exit_and_notify(EXIT_FAILURE);
         }
     }
 }
@@ -649,7 +649,7 @@ void processNeighbors()
         {
             SWSS_LOG_ERROR("failed to create_neighbor_entry: %d", status);
 
-            exit(EXIT_FAILURE);
+            exit_and_notify(EXIT_FAILURE);
         }
     }
 }
@@ -692,7 +692,7 @@ void processRoutes()
         {
             SWSS_LOG_ERROR("failed to create_route_entry: %d", status);
 
-            exit(EXIT_FAILURE);
+            exit_and_notify(EXIT_FAILURE);
         }
     }
 }
@@ -740,7 +740,7 @@ void processTraps()
             {
                 SWSS_LOG_ERROR("failed to set_trap_attribute %d: %d", trapId, status);
 
-                exit(EXIT_FAILURE);
+                exit_and_notify(EXIT_FAILURE);
             }
         }
     }
diff --git a/syncd/syncd_reinit.cpp b/syncd/syncd_reinit.cpp

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,35 @@ std::map<std::string, std::string> gProfileMap;`
`11`	`11`
`12`	`12`	`bool g_veryFirstRun = false;`
`13`	`13`
	`14`	`+void exit_and_notify(int status)`
	`15`	`+{`
	`16`	`+ SWSS_LOG_ENTER();`
	`17`	`+`
	`18`	`+ try`
	`19`	`+ {`
	`20`	`+ if (notifications != NULL)`
	`21`	`+ {`
	`22`	`+ std::vector<swss::FieldValueTuple> entry;`
	`23`	`+`
	`24`	`+ SWSS_LOG_NOTICE("sending switch_shutdown_request notification to OA");`
	`25`	`+`
	`26`	`+ notifications->send("switch_shutdown_request", "", entry);`
	`27`	`+`
	`28`	`+ SWSS_LOG_NOTICE("notification send successfull");`
	`29`	`+ }`
	`30`	`+ }`
	`31`	`+ catch(const std::exception &e)`
	`32`	`+ {`
	`33`	`+ SWSS_LOG_ERROR("Runtime error: %s", e.what());`
	`34`	`+ }`
	`35`	`+ catch(...)`
	`36`	`+ {`
	`37`	`+ SWSS_LOG_ERROR("Unknown runtime error");`
	`38`	`+ }`
	`39`	`+`
	`40`	`+ exit(status);`
	`41`	`+}`
	`42`	`+`
`14`	`43`	`void sai_diag_shell()`
`15`	`44`	`{`
`16`	`45`	`SWSS_LOG_ENTER();`
`@@ -87,8 +116,7 @@ sai_object_id_t translate_rid_to_vid(`
`87`	`116`	`if (object_type == SAI_OBJECT_TYPE_NULL)`
`88`	`117`	`{`
`89`	`118`	`SWSS_LOG_ERROR("sai_object_type_query returned NULL type for RID %llx", rid);`
`90`		`-`
`91`		`- exit(EXIT_FAILURE);`
	`119`	`+ exit_and_notify(EXIT_FAILURE);`
`92`	`120`	`}`
`93`	`121`
`94`	`122`	`vid = redis_create_virtual_object_id(object_type);`
`@@ -135,8 +163,7 @@ void translate_rid_to_vid_list(`
`135`	`163`	`if (status != SAI_STATUS_SUCCESS)`
`136`	`164`	`{`
`137`	`165`	`SWSS_LOG_ERROR("unable to find serialization type for object type %x, attribute %x", object_type, attr.id);`
`138`		`-`
`139`		`- exit(EXIT_FAILURE);`
	`166`	`+ exit_and_notify(EXIT_FAILURE);`
`140`	`167`	`}`
`141`	`168`
`142`	`169`	`switch (serialization_type)`
`@@ -195,8 +222,7 @@ sai_object_id_t translate_vid_to_rid(`
`195`	`222`	`if (prid == NULL)`
`196`	`223`	`{`
`197`	`224`	`SWSS_LOG_ERROR("unable to get RID for VID: %s", str_vid.c_str());`
`198`		`-`
`199`		`- exit(EXIT_FAILURE);`
	`225`	`+ exit_and_notify(EXIT_FAILURE);`
`200`	`226`	`}`
`201`	`227`
`202`	`228`	`str_rid = *prid;`
`@@ -231,8 +257,7 @@ void translate_vid_to_rid_list(`
`231`	`257`	`if (status != SAI_STATUS_SUCCESS)`
`232`	`258`	`{`
`233`	`259`	`SWSS_LOG_ERROR("unable to find serialization type for object type %x, attribute %x", object_type, attr.id);`
`234`		`-`
`235`		`- exit(EXIT_FAILURE);`
	`260`	`+ exit_and_notify(EXIT_FAILURE);`
`236`	`261`	`}`
`237`	`262`
`238`	`263`	`switch (serialization_type)`
`@@ -422,7 +447,7 @@ sai_status_t handle_generic(`
`422`	`447`	`if (create == NULL)`
`423`	`448`	`{`
`424`	`449`	`SWSS_LOG_ERROR("create function is not defined for object type %x", object_type);`
`425`		`- exit(EXIT_FAILURE);`
	`450`	`+ exit_and_notify(EXIT_FAILURE);`
`426`	`451`	`}`
`427`	`452`
`428`	`453`	`sai_object_id_t real_object_id;`
`@@ -461,7 +486,7 @@ sai_status_t handle_generic(`
`461`	`486`	`if (remove == NULL)`
`462`	`487`	`{`
`463`	`488`	`SWSS_LOG_ERROR("remove function is not defined for object type %x", object_type);`
`464`		`- exit(EXIT_FAILURE);`
	`489`	`+ exit_and_notify(EXIT_FAILURE);`
`465`	`490`	`}`
`466`	`491`
`467`	`492`	`sai_object_id_t rid = translate_vid_to_rid(object_id);`
`@@ -487,7 +512,7 @@ sai_status_t handle_generic(`
`487`	`512`	`if (set == NULL)`
`488`	`513`	`{`
`489`	`514`	`SWSS_LOG_ERROR("set function is not defined for object type %x", object_type);`
`490`		`- exit(EXIT_FAILURE);`
	`515`	`+ exit_and_notify(EXIT_FAILURE);`
`491`	`516`	`}`
`492`	`517`
`493`	`518`	`sai_object_id_t rid = translate_vid_to_rid(object_id);`
`@@ -504,7 +529,7 @@ sai_status_t handle_generic(`
`504`	`529`	`if (get == NULL)`
`505`	`530`	`{`
`506`	`531`	`SWSS_LOG_ERROR("get function is not defined for object type %x", object_type);`
`507`		`- exit(EXIT_FAILURE);`
	`532`	`+ exit_and_notify(EXIT_FAILURE);`
`508`	`533`	`}`
`509`	`534`
`510`	`535`	`sai_object_id_t rid = translate_vid_to_rid(object_id);`
`@@ -514,7 +539,7 @@ sai_status_t handle_generic(`
`514`	`539`
`515`	`540`	`default:`
`516`	`541`	`SWSS_LOG_ERROR("generic other apis not implemented");`
`517`		`- exit(EXIT_FAILURE);`
	`542`	`+ exit_and_notify(EXIT_FAILURE);`
`518`	`543`	`}`
`519`	`544`	`}`
`520`	`545`
`@@ -546,7 +571,7 @@ sai_status_t handle_fdb(`
`546`	`571`
`547`	`572`	`default:`
`548`	`573`	`SWSS_LOG_ERROR("fdb other apis not implemented");`
`549`		`- exit(EXIT_FAILURE);`
	`574`	`+ exit_and_notify(EXIT_FAILURE);`
`550`	`575`	`}`
`551`	`576`	`}`
`552`	`577`
`@@ -574,7 +599,7 @@ sai_status_t handle_switch(`
`574`	`599`
`575`	`600`	`default:`
`576`	`601`	`SWSS_LOG_ERROR("switch other apis not implemented");`
`577`		`- exit(EXIT_FAILURE);`
	`602`	`+ exit_and_notify(EXIT_FAILURE);`
`578`	`603`	`}`
`579`	`604`	`}`
`580`	`605`
`@@ -608,7 +633,7 @@ sai_status_t handle_neighbor(`
`608`	`633`
`609`	`634`	`default:`
`610`	`635`	`SWSS_LOG_ERROR("neighbor other apis not implemented");`
`611`		`- exit(EXIT_FAILURE);`
	`636`	`+ exit_and_notify(EXIT_FAILURE);`
`612`	`637`	`}`
`613`	`638`	`}`
`614`	`639`
`@@ -644,7 +669,7 @@ sai_status_t handle_route(`
`644`	`669`
`645`	`670`	`default:`
`646`	`671`	`SWSS_LOG_ERROR("route other apis not implemented");`
`647`		`- exit(EXIT_FAILURE);`
	`672`	`+ exit_and_notify(EXIT_FAILURE);`
`648`	`673`	`}`
`649`	`674`	`}`
`650`	`675`
`@@ -676,7 +701,7 @@ sai_status_t handle_vlan(`
`676`	`701`
`677`	`702`	`default:`
`678`	`703`	`SWSS_LOG_ERROR("vlan other apis not implemented");`
`679`		`- exit(EXIT_FAILURE);`
	`704`	`+ exit_and_notify(EXIT_FAILURE);`
`680`	`705`	`}`
`681`	`706`	`}`
`682`	`707`
`@@ -704,7 +729,7 @@ sai_status_t handle_trap(`
`704`	`729`
`705`	`730`	`default:`
`706`	`731`	`SWSS_LOG_ERROR("trap other apis not implemented");`
`707`		`- exit(EXIT_FAILURE);`
	`732`	`+ exit_and_notify(EXIT_FAILURE);`
`708`	`733`	`}`
`709`	`734`	`}`
`710`	`735`
`@@ -805,7 +830,7 @@ sai_status_t processEvent(swss::ConsumerTable &consumer)`
`805`	`830`	`{`
`806`	`831`	`SWSS_LOG_ERROR("failed to execute api: %s: %d", op.c_str(), status);`
`807`	`832`
`808`		`- exit(EXIT_FAILURE);`
	`833`	`+ exit_and_notify(EXIT_FAILURE);`
`809`	`834`	`}`
`810`	`835`
`811`	`836`	`return status;`
`@@ -1294,7 +1319,7 @@ int main(int argc, char **argv)`
`1294`	`1319`	`if (status != SAI_STATUS_SUCCESS)`
`1295`	`1320`	`{`
`1296`	`1321`	`SWSS_LOG_ERROR("fail to sai_initialize_switch: %d", status);`
`1297`		`- exit(EXIT_FAILURE);`
	`1322`	`+ exit_and_notify(EXIT_FAILURE);`
`1298`	`1323`	`}`
`1299`	`1324`
`1300`	`1325`	`#ifdef BRCMSAI`
`@@ -1371,7 +1396,7 @@ int main(int argc, char **argv)`
`1371`	`1396`	`{`
`1372`	`1397`	`SWSS_LOG_ERROR("Runtime error: %s", e.what());`
`1373`	`1398`
`1374`		`- exit(EXIT_FAILURE);`
	`1399`	`+ exit_and_notify(EXIT_FAILURE);`
`1375`	`1400`	`}`
`1376`	`1401`
`1377`	`1402`	`endCountersThread();`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ sai_object_type_t getObjectTypeFromVid(sai_object_id_t sai_object_id)`
`44`	`44`	`{`
`45`	`45`	`SWSS_LOG_ERROR("invalid object type: %x on object id: %llx", objectType, sai_object_id);`
`46`	`46`
`47`		`- exit(EXIT_FAILURE);`
	`47`	`+ exit_and_notify(EXIT_FAILURE);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`return objectType;`
`@@ -89,7 +89,7 @@ sai_object_type_t getObjectTypeFromAsicKey(const std::string &key)`
`89`	`89`	`{`
`90`	`90`	`SWSS_LOG_ERROR("invalid object type: %x on asic key: %s", objectType, key.c_str());`
`91`	`91`
`92`		`- exit(EXIT_FAILURE);`
	`92`	`+ exit_and_notify(EXIT_FAILURE);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`return objectType;`
`@@ -134,7 +134,7 @@ void checkAllIds()`
`134`	`134`	`{`
`135`	`135`	`SWSS_LOG_ERROR("failed to find vid %llx in previous map", kv.first);`
`136`	`136`
`137`		`- exit(EXIT_FAILURE);`
	`137`	`+ exit_and_notify(EXIT_FAILURE);`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`g_vidToRidMap.erase(it);`
`@@ -151,7 +151,7 @@ void checkAllIds()`
`151`	`151`	`SWSS_LOG_ERROR("vid not translated: %llx, object type: %llx", kv.first, objectType);`
`152`	`152`	`}`
`153`	`153`
`154`		`- exit(EXIT_FAILURE);`
	`154`	`+ exit_and_notify(EXIT_FAILURE);`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`redisSetVidAndRidMap(g_translated);`
`@@ -257,7 +257,7 @@ sai_object_id_t processSingleVid(sai_object_id_t vid)`
`257`	`257`	`{`
`258`	`258`	`SWSS_LOG_ERROR("failed to find VID %llx in VIDTORID map", vid);`
`259`	`259`
`260`		`- exit(EXIT_FAILURE);`
	`260`	`+ exit_and_notify(EXIT_FAILURE);`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`sai_object_id_t virtualRouterRid = it->second;`
`@@ -288,7 +288,7 @@ sai_object_id_t processSingleVid(sai_object_id_t vid)`
`288`	`288`	`{`
`289`	`289`	`SWSS_LOG_ERROR("failed to find VID %llx in VIDTORID map", vid);`
`290`	`290`
`291`		`- exit(EXIT_FAILURE);`
	`291`	`+ exit_and_notify(EXIT_FAILURE);`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`rid = it->second;`
`@@ -304,7 +304,7 @@ sai_object_id_t processSingleVid(sai_object_id_t vid)`
`304`	`304`	`{`
`305`	`305`	`SWSS_LOG_ERROR("failed to find VID %s in OIDs map", strVid.c_str());`
`306`	`306`
`307`		`- exit(EXIT_FAILURE);`
	`307`	`+ exit_and_notify(EXIT_FAILURE);`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`std::string asicKey = oit->second;;`
`@@ -325,7 +325,7 @@ sai_object_id_t processSingleVid(sai_object_id_t vid)`
`325`	`325`	`{`
`326`	`326`	`SWSS_LOG_ERROR("create function is not defined for object type %llx", objectType);`
`327`	`327`
`328`		`- exit(EXIT_FAILURE);`
	`328`	`+ exit_and_notify(EXIT_FAILURE);`
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`sai_status_t status = create(&rid, attrCount, attrList);`
`@@ -334,7 +334,7 @@ sai_object_id_t processSingleVid(sai_object_id_t vid)`
`334`	`334`	`{`
`335`	`335`	`SWSS_LOG_ERROR("failed to create object %llx: %d", objectType, status);`
`336`	`336`
`337`		`- exit(EXIT_FAILURE);`
	`337`	`+ exit_and_notify(EXIT_FAILURE);`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`SWSS_LOG_DEBUG("created object of type %x, processed VID %llx to RID %llx", objectType, vid, rid);`
`@@ -355,7 +355,7 @@ sai_object_id_t processSingleVid(sai_object_id_t vid)`
`355`	`355`	`{`
`356`	`356`	`SWSS_LOG_ERROR("failed to set attribute for object type %llx attr id %llx: %d", objectType, attr->id, status);`
`357`	`357`
`358`		`- exit(EXIT_FAILURE);`
	`358`	`+ exit_and_notify(EXIT_FAILURE);`
`359`	`359`	`}`
`360`	`360`	`}`
`361`	`361`	`}`
`@@ -376,7 +376,7 @@ sai_attr_serialization_type_t getSerializationType(sai_object_type_t objectType,`
`376`	`376`	`{`
`377`	`377`	`SWSS_LOG_ERROR("unable to find serialization type on object type %x and attr id %x", objectType, attrId);`
`378`	`378`
`379`		`- exit(EXIT_FAILURE);`
	`379`	`+ exit_and_notify(EXIT_FAILURE);`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	`return serializationType;`
`@@ -505,7 +505,7 @@ void processSwitch()`
`505`	`505`	`{`
`506`	`506`	`SWSS_LOG_ERROR("failed to set_switch_attribute %llx: %d", attr->id, status);`
`507`	`507`
`508`		`- exit(EXIT_FAILURE);`
	`508`	`+ exit_and_notify(EXIT_FAILURE);`
`509`	`509`	`}`
`510`	`510`	`}`
`511`	`511`	`}`
`@@ -542,7 +542,7 @@ void processVlans()`
`542`	`542`	`{`
`543`	`543`	`SWSS_LOG_ERROR("failed to create_vlan %d: %d", vlanId, status);`
`544`	`544`
`545`		`- exit(EXIT_FAILURE);`
	`545`	`+ exit_and_notify(EXIT_FAILURE);`
`546`	`546`	`}`
`547`	`547`	`}`
`548`	`548`
`@@ -564,7 +564,7 @@ void processVlans()`
`564`	`564`	`{`
`565`	`565`	`SWSS_LOG_ERROR("failed to set_vlan_attribute %llx: %d", attr->id, status);`
`566`	`566`
`567`		`- exit(EXIT_FAILURE);`
	`567`	`+ exit_and_notify(EXIT_FAILURE);`
`568`	`568`	`}`
`569`	`569`	`}`
`570`	`570`	`}`
`@@ -606,7 +606,7 @@ void processFdbs()`
`606`	`606`	`{`
`607`	`607`	`SWSS_LOG_ERROR("failed to create_fdb_entry: %d", status);`
`608`	`608`
`609`		`- exit(EXIT_FAILURE);`
	`609`	`+ exit_and_notify(EXIT_FAILURE);`
`610`	`610`	`}`
`611`	`611`	`}`
`612`	`612`	`}`
`@@ -649,7 +649,7 @@ void processNeighbors()`
`649`	`649`	`{`
`650`	`650`	`SWSS_LOG_ERROR("failed to create_neighbor_entry: %d", status);`
`651`	`651`
`652`		`- exit(EXIT_FAILURE);`
	`652`	`+ exit_and_notify(EXIT_FAILURE);`
`653`	`653`	`}`
`654`	`654`	`}`
`655`	`655`	`}`
`@@ -692,7 +692,7 @@ void processRoutes()`
`692`	`692`	`{`
`693`	`693`	`SWSS_LOG_ERROR("failed to create_route_entry: %d", status);`
`694`	`694`
`695`		`- exit(EXIT_FAILURE);`
	`695`	`+ exit_and_notify(EXIT_FAILURE);`
`696`	`696`	`}`
`697`	`697`	`}`
`698`	`698`	`}`
`@@ -740,7 +740,7 @@ void processTraps()`
`740`	`740`	`{`
`741`	`741`	`SWSS_LOG_ERROR("failed to set_trap_attribute %d: %d", trapId, status);`
`742`	`742`
`743`		`- exit(EXIT_FAILURE);`
	`743`	`+ exit_and_notify(EXIT_FAILURE);`
`744`	`744`	`}`
`745`	`745`	`}`
`746`	`746`	`}`