]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/mirroring: `daemon status` command does not require file system name
authorVenky Shankar <vshankar@redhat.com>
Mon, 2 Aug 2021 04:23:23 +0000 (00:23 -0400)
committerVenky Shankar <vshankar@redhat.com>
Mon, 2 Aug 2021 10:39:16 +0000 (06:39 -0400)
Signed-off-by: Venky Shankar <vshankar@redhat.com>
src/pybind/mgr/mirroring/fs/snapshot_mirror.py
src/pybind/mgr/mirroring/module.py

index a3295514c2d9b269b78b8eb4fe03fd081228647a..ad9e550435d801eb36eaa6317a695061d1b76436 100644 (file)
@@ -749,14 +749,9 @@ class FSSnapshotMirror:
         except MirrorException as me:
             return me.args[0], '', me.args[1]
 
-    def daemon_status(self, filesystem):
+    def daemon_status(self):
         try:
             with self.lock:
-                if not self.filesystem_exist(filesystem):
-                    raise MirrorException(-errno.ENOENT, f'filesystem {filesystem} does not exist')
-                fspolicy = self.pool_policy.get(filesystem, None)
-                if not fspolicy:
-                    raise MirrorException(-errno.EINVAL, f'filesystem {filesystem} is not mirrored')
                 daemons = []
                 sm = self.mgr.get('service_map')
                 daemon_entry = sm['services'].get('cephfs-mirror', None)
index 19b0f76edbac9bbfcb9f24548ca04ed1b0fc141c..b9223111ae902507aa3f52ea374d1adce0ae0cf7 100644 (file)
@@ -97,7 +97,6 @@ class Module(MgrModule):
         return self.fs_snapshot_mirror.show_distribution(fs_name)
 
     @CLIReadCommand('fs snapshot mirror daemon status')
-    def snapshot_mirror_daemon_status(self,
-                                      fs_name: str):
+    def snapshot_mirror_daemon_status(self):
         """Get mirror daemon status"""
-        return self.fs_snapshot_mirror.daemon_status(fs_name)
+        return self.fs_snapshot_mirror.daemon_status()