refactor: call gc_stop_service in cleanup.abort instead of SR.detach to match upstream request

Signed-off-by: Mathieu Labourier <mathieu.labourier@vates.tech>

Author: Millefeuille42

drivers/CephFSSR.py

@@ -216,7 +216,6 @@ def detach(self, sr_uuid) -> None:
         self.unmount(self.mountpoint, True)
         os.unlink(self.path)
         self.attached = False
-        cleanup.stop_gc_service(sr_uuid)
 
     @override
     def create(self, sr_uuid, size) -> None:

drivers/FileSR.py

@@ -197,7 +197,6 @@ def detach(self, sr_uuid) -> None:
             except Exception as e:
                 raise xs_errors.XenError('SRInUse', opterr=str(e))
         self.attached = False
-        cleanup.stop_gc_service(sr_uuid)
 
     @override
     def scan(self, sr_uuid) -> None:

drivers/GlusterFSSR.py

@@ -196,7 +196,6 @@ def detach(self, sr_uuid) -> None:
         self.unmount(self.mountpoint, True)
         os.unlink(self.path)
         self.attached = False
-        cleanup.stop_gc_service(sr_uuid)
 
     @override
     def create(self, sr_uuid, size) -> None:

drivers/LVHDSR.py

@@ -668,7 +668,6 @@ def detach(self, uuid) -> None:
         # However, we should still delete lock files on slaves as it is the
         # only place to do so.
         self._cleanup(self.isMaster)
-        cleanup.stop_gc_service(uuid)
 
     @override
     def forget_vdi(self, uuid) -> None:

drivers/LinstorSR.py

@@ -746,7 +746,6 @@ def attach(self, uuid) -> None:
     def detach(self, uuid) -> None:
         util.SMlog('LinstorSR.detach for {}'.format(self.uuid))
         cleanup.abort(self.uuid)
-        cleanup.stop_gc_service(uuid)
 
     @override
     @_locked_load

drivers/MooseFSSR.py

@@ -210,7 +210,6 @@ def detach(self, sr_uuid) -> None:
         os.chdir(SR.MOUNT_BASE)
         self.unmount(self.mountpoint, True)
         self.attached = False
-        cleanup.stop_gc_service(sr_uuid)
 
     @override
     def create(self, sr_uuid, size) -> None:

drivers/NFSSR.py

@@ -206,7 +206,6 @@ def detach(self, sr_uuid) -> None:
             raise xs_errors.XenError('NFSUnMount', opterr=exc.errstr)
 
         self.attached = False
-        cleanup.stop_gc_service(sr_uuid)
 
     @override
     def create(self, sr_uuid, size) -> None:

drivers/SMBSR.py

@@ -248,7 +248,6 @@ def detach(self, sr_uuid) -> None:
             raise xs_errors.XenError('SMBUnMount', opterr=exc.errstr)
 
         self.attached = False
-        cleanup.stop_gc_service(sr_uuid)
 
     @override
     def create(self, sr_uuid, size) -> None:

drivers/cleanup.py

@@ -3948,6 +3948,7 @@ def abort(srUuid, soft=False):
     """Abort GC/coalesce if we are currently GC'ing or coalescing a VDI pair.
     """
     if _abort(srUuid, soft):
+        stop_gc_service(srUuid)
         Util.log("abort: releasing the process lock")
         lockGCActive.release()
         return True

tests/test_cleanup.py

@@ -407,8 +407,7 @@ def test_lock_released_by_abort_when_held(
         cleanup.lockGCActive = TestRelease()
         cleanup.lockGCActive.release = mock.Mock(return_value=None)
 
-        ret = cleanup.abort(mock_sr, False)
-
+        ret = cleanup.abort(str(mock_sr.uuid), False)
         # Pass on the return from _abort.
         self.assertEqual(True, ret)