[ctrmgrd] Fix the container restart during config reload

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>
sonic-net · Jul 10, 2024 · 24f2149 · 24f2149
1 parent 1c35c62
commit 24f2149
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py b/src/sonic-ctrmgrd/ctrmgr/ctrmgrd.py
@@ -489,7 +489,9 @@ def handle_update(self, feat, set_owner, ct_owner, remote_state):
         service_restart = False
 
         if set_owner == "local":
-            if ct_owner != "local":
+            # NOTE: no need to restart if the current owner is none,
+            # as none implies the container is not running,
+            if ct_owner != "local" and ct_owner != "none":
                 service_restart = True
         else:
             if (ct_owner != "none") and (remote_state == "pending"):

diff --git a/src/sonic-ctrmgrd/tests/ctrmgrd_test.py b/src/sonic-ctrmgrd/tests/ctrmgrd_test.py
@@ -355,6 +355,38 @@
                 }
             }
         }
+    },
+    5: {
+        common_test.DESCR: "No restart for current_owner == none in config reload",
+        common_test.ARGS: "ctrmgrd",
+        common_test.PRE: {
+            common_test.CONFIG_DB_NO: {
+                common_test.FEATURE_TABLE: {
+                    "swss": {
+                        "set_owner": "local",
+                        "state": "enabled",
+                        "auto_restart": "enabled"
+                    }
+                }
+            }
+        },
+        common_test.UPD: {
+            common_test.STATE_DB_NO: {
+                common_test.FEATURE_TABLE: {
+                    "swss": {
+                        "system_state": "down",
+                        "remote_state": "none",
+                        "current_owner": "none",
+                        "container_id": "",
+                        "state": "enabled"
+                    }
+                }
+            }
+        },
+        common_test.POST: {
+            common_test.STATE_DB_NO: {
+            }
+        }
     }
 }