From ddeefc8252d4d3dd6e14e53a559417e76dde003a Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Thu, 12 Mar 2020 13:25:43 +0100 Subject: [PATCH] mgr_util: move is_stopping from VolumeClient to CephfsClient Signed-off-by: Jan Fajerski (cherry picked from commit 8c94c21d098ac31708dda66cd35ccb0da5d1fd75) --- src/pybind/mgr/mgr_util.py | 3 +++ src/pybind/mgr/volumes/fs/volume.py | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/mgr_util.py b/src/pybind/mgr/mgr_util.py index d9abb208eda..0d93db31c89 100644 --- 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 4128ecc163a..039d2ee1844 100644 --- 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") -- 2.47.3