From: Jan Fajerski Date: Thu, 12 Mar 2020 12:25:43 +0000 (+0100) Subject: mgr_util: move is_stopping from VolumeClient to CephfsClient X-Git-Tag: v16.0.0~23^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8c94c21d098ac31708dda66cd35ccb0da5d1fd75;p=ceph.git mgr_util: move is_stopping from VolumeClient to CephfsClient Signed-off-by: Jan Fajerski --- diff --git a/src/pybind/mgr/mgr_util.py b/src/pybind/mgr/mgr_util.py index f2142711917..550df62a34c 100644 --- 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 d59c949826a..454348ca961 100644 --- 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")