CA-390937: start GC as a standalone process

To avoind inheriting locks and open files through a fork start the GC cleanup script as a standalone process. Signed-off-by: Mark Syms <[email protected]>
xapi-project · May 23, 2024 · 0074702 · 0074702
1 parent b82d549
commit 0074702
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/drivers/FileSR.py b/drivers/FileSR.py
@@ -402,7 +402,7 @@ def _kickGC(self):
             lockRunning.release()
 
         util.SMlog("Kicking GC")
-        cleanup.gc(self.session, self.uuid, True)
+        cleanup.start_gc(self.uuid)
 
     def _isbind(self):
         # os.path.ismount can't deal with bind mount

diff --git a/drivers/LVHDSR.py b/drivers/LVHDSR.py
@@ -1311,7 +1311,7 @@ def _kickGC(self):
             lockRunning.release()
 
         util.SMlog("Kicking GC")
-        cleanup.gc(self.session, self.uuid, True)
+        cleanup.start_gc(self.uuid)
 
     def ensureCBTSpace(self):
         # Ensure we have space for at least one LV

diff --git a/drivers/cleanup.py b/drivers/cleanup.py
@@ -3198,6 +3198,12 @@ def gc(session, srUuid, inBackground, dryRun=False):
         _gc(session, srUuid, dryRun, immediate=True)
 
 
+def start_gc(sr_uuid):
+    util.SMlog(f"Starting GC file is {__file__}")
+    subprocess.run([__file__, '-b', '-u', sr_uuid, '-g'],
+                   stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
+
+
 def gc_force(session, srUuid, force=False, dryRun=False, lockSR=False):
     """Garbage collect all deleted VDIs in SR "srUuid". The caller must ensure
     the SR lock is held.