mgr_util: move is_stopping from VolumeClient to CephfsClient

Signed-off-by: Jan Fajerski <jfajerski@suse.com>

diff --git a/src/pybind/mgr/mgr_util.py b/src/pybind/mgr/mgr_util.py
index f21427119175c3e82dd321ddbcbb0ab8b1b95822..550df62a34c6e7830ffb21a8bfcb1fcd6ea58838 100644 (file)
--- a/src/pybind/mgr/mgr_util.py
+++ b/src/pybind/mgr/mgr_util.py
@@ -232,6 +232,9 @@ class CephfsClient(object):
         self.stopping = Event()
         self.connection_pool = CephfsConnectionPool(self.mgr)
 
+    def is_stopping(self):
+        return self.stopping.is_set()
+
     def shutdown(self):
         logger.info("shutting down")
         # first, note that we're shutting down

diff --git a/src/pybind/mgr/volumes/fs/volume.py b/src/pybind/mgr/volumes/fs/volume.py
index d59c949826a1ef034077a794ea3800cb22474194..454348ca9618b9808cc04970953e8ca7dd7e0ade 100644 (file)
--- a/src/pybind/mgr/volumes/fs/volume.py
+++ b/src/pybind/mgr/volumes/fs/volume.py
@@ -55,9 +55,6 @@ class VolumeClient(CephfsClient):
             self.cloner.queue_job(fs['mdsmap']['fs_name'])
             self.purge_queue.queue_job(fs['mdsmap']['fs_name'])
 
-    def is_stopping(self):
-        return self.stopping.is_set()
-
     def shutdown(self):
         # Overrides CephfsClient.shutdown()
         log.info("shutting down")