Merge pull request #493

Fix resources presync not executed on "sync* --rid <sync rids>" actions

opensvc/core/objects/svc.py

@@ -4671,7 +4671,6 @@ def sync_nodes(self):
         ]
         if not self.can_sync(rtypes, 'nodes'):
             return
-        self.presync()
         self.sub_set_action(rtypes, "sync_nodes")
 
     def sync_drp(self):
@@ -4684,7 +4683,6 @@ def sync_drp(self):
         ]
         if not self.can_sync(rtypes, 'drpnodes'):
             return
-        self.presync()
         self.sub_set_action(rtypes, "sync_drp")
 
     def sync_swap(self):
@@ -4827,7 +4825,6 @@ def sync_all(self):
         if not self.can_sync(["sync"]):
             return
         self.sync_update()
-        self.presync()
         rtypes = [
             "sync.rsync",
             "sync.btrfs",

opensvc/drivers/resource/sync/rsync/__init__.py

@@ -222,6 +222,7 @@ def __init__(self,
         self.timeout = 3600
         self.options = options
         self.reset_options = reset_options
+        self.presync_done = False
 
     def __str__(self):
         return "%s src=%s dst=%s options=%s target=%s" % (
@@ -564,8 +565,19 @@ def full_options(self):
     def add_resource_files_to_sync(self):
         if self.rid != "sync#i0":
             return
-        for resource in self.svc.get_resources():
-            self.src += resource.files_to_sync()
+        for r in self.svc.get_resources():
+            self.src += r.files_to_sync()
+        if self.presync_done:
+            return
+        for r in self.svc.get_resources():
+            if r.disabled:
+                continue
+            if r.encap and not self.svc.encap:
+                continue
+            if not hasattr(r, "presync"):
+                continue
+            r.presync()
+        self.presync_done = True
 
     def _info(self):
         self.add_resource_files_to_sync()