From 4aa8e4dfaa56a91396d59fef43a3330870077177 Mon Sep 17 00:00:00 2001 From: Christophe Varoqui Date: Wed, 3 Feb 2021 18:33:03 +0100 Subject: [PATCH] Fix the "restart --rid ip" stopping but not starting ip.netns resources --- opensvc/core/resourceset.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/opensvc/core/resourceset.py b/opensvc/core/resourceset.py index 05b5b175bb..d5d981464f 100644 --- 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: