Fix the "restart --rid ip" stopping but not starting ip.netns resources

opensvc · Feb 11, 2021 · 4aa8e4d · 4aa8e4d
1 parent 98797c2
commit 4aa8e4d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/opensvc/core/resourceset.py b/opensvc/core/resourceset.py
@@ -214,14 +214,17 @@ def action_resources(self, action, tags, xtags, xtypes, types):
         Return resources to execute the action on.
         """
         if len(xtags) > 0:
+            action_rid_before_depends = set(self.svc.action_rid_before_depends)
             resources = []
             for res in self.resources:
                 if not self.tag_match(res.tags, xtags):
                     resources.append(res)
                     continue
                 if self.svc.command_is_scoped() and \
-                   res.rid in self.svc.action_rid_before_depends and \
-                   len(self.svc.action_rid_dependencies(action, res.rid)) == 0:
+                   res.rid in self.svc.action_rid_before_depends:
+                    deps = self.svc.action_rid_dependencies(action, res.rid)
+                    if deps and deps < action_rid_before_depends:
+                        continue
                     resources.append(res)
                     continue
         else: