mgr_util: move is_stopping from VolumeClient to CephfsClient

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 8c94c21d098ac31708dda66cd35ccb0da5d1fd75)

diff --git a/src/pybind/mgr/mgr_util.py b/src/pybind/mgr/mgr_util.py
index d9abb208edab59842507e3c5cfcec00a76e4fc65..0d93db31c8906c050725578faa5c53f9441b37d1 100644 (file)
--- a/src/pybind/mgr/mgr_util.py
+++ b/src/pybind/mgr/mgr_util.py
@@ -233,6 +233,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 4128ecc163af165408df47f4b249aae4a59df6e6..039d2ee1844fb51269ddadb63594c95e669dc5ee 100644 (file)
--- a/src/pybind/mgr/volumes/fs/volume.py
+++ b/src/pybind/mgr/volumes/fs/volume.py
@@ -58,9 +58,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")