[teamsyncd][teammgrd] Graceful exit after receiving SIGTERM (#1407)

* [teamsyncd][teammgrd] Graceful exit after receiving SIGTERM Signed-off-by: Sabareesh Kumar Anandan <sanandan@marvell.com> * Update teammgrd.cpp * Update teamsyncd.cpp Co-authored-by: pavel-shirshov <pavelsh@microsoft.com>
sonic-net · Sep 4, 2020 · e54948a · e54948a
1 parent 1b89185
commit e54948a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 34 deletions.
diff --git a/cfgmgr/teammgrd.cpp b/cfgmgr/teammgrd.cpp
@@ -65,14 +65,8 @@ int main(int argc, char **argv)
             s.addSelectables(o->getSelectables());
         }
 
-        while (true)
-        {
-            if(received_sigterm)
-            {
-                teammgr.cleanTeamProcesses(SIGTERM);
-                received_sigterm = false;
-            }
-
+        while (!received_sigterm)
+        {            
             Selectable *sel;
             int ret;
 
@@ -91,6 +85,8 @@ int main(int argc, char **argv)
             auto *c = (Executor *)sel;
             c->execute();
         }
+        teammgr.cleanTeamProcesses(SIGTERM);
+        SWSS_LOG_NOTICE("Exiting");
     }
     catch (const exception &e)
     {

diff --git a/teamsyncd/teamsyncd.cpp b/teamsyncd/teamsyncd.cpp
@@ -32,36 +32,28 @@ int main(int argc, char **argv)
     /* Register the signal handler for SIGTERM */
     signal(SIGTERM, sig_handler);
 
-    while (1)
+    try
     {
-        try
-        {
-            NetLink netlink;
-
-            netlink.registerGroup(RTNLGRP_LINK);
-            cout << "Listens to teamd events..." << endl;
-            netlink.dumpRequest(RTM_GETLINK);
-
-            s.addSelectable(&netlink);
-            while (true)
-            {
-                if(received_sigterm)
-                {
-                  sync.cleanTeamSync();
-                  received_sigterm = false;
-                }
+        NetLink netlink;
+        netlink.registerGroup(RTNLGRP_LINK);
+        cout << "Listens to teamd events..." << endl;
+        netlink.dumpRequest(RTM_GETLINK);
 
-                Selectable *temps;
-                s.select(&temps, 1000); // block for a second
-                sync.periodic();
-            }
-        }
-        catch (const std::exception& e)
+        s.addSelectable(&netlink);
+        while (!received_sigterm)
         {
-            cout << "Exception \"" << e.what() << "\" had been thrown in deamon" << endl;
-            return 0;
+            Selectable *temps;
+            s.select(&temps, 1000); // block for a second
+            sync.periodic();
         }
+        sync.cleanTeamSync();
+        SWSS_LOG_NOTICE("Received SIGTERM Exiting");
+    }
+    catch (const std::exception& e)
+    {
+        cout << "Exception \"" << e.what() << "\" had been thrown in deamon" << endl;
+        return 0;
     }
 
-    return 1;
+    return 0;
 }