diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-23 16:45:17 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-23 16:45:44 +0000 |
commit | 17d6a993fc17d533460c5f40f3908c708e057c18 (patch) | |
tree | 1a3bd93e0ecd74fa02f93a528fe2f87e5314c4b5 /src/pybind/mgr/mirroring | |
parent | Releasing progress-linux version 18.2.2-0progress7.99u1. (diff) | |
download | ceph-17d6a993fc17d533460c5f40f3908c708e057c18.tar.xz ceph-17d6a993fc17d533460c5f40f3908c708e057c18.zip |
Merging upstream version 18.2.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | src/pybind/mgr/mirroring/fs/snapshot_mirror.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/pybind/mgr/mirroring/fs/snapshot_mirror.py b/src/pybind/mgr/mirroring/fs/snapshot_mirror.py index 6fa8d0c4c..89da37920 100644 --- a/src/pybind/mgr/mirroring/fs/snapshot_mirror.py +++ b/src/pybind/mgr/mirroring/fs/snapshot_mirror.py @@ -558,14 +558,11 @@ class FSSnapshotMirror: peers = self.get_filesystem_peers(filesystem) peer_res = {} for peer_uuid, rem in peers.items(): - conf = self.config_get(FSSnapshotMirror.peer_config_key(filesystem, peer_uuid)) remote = rem['remote'] peer_res[peer_uuid] = {'client_name': remote['client_name'], 'site_name': remote['cluster_name'], 'fs_name': remote['fs_name'] } - if 'mon_host' in conf: - peer_res[peer_uuid]['mon_host'] = conf['mon_host'] return 0, json.dumps(peer_res), '' except MirrorException as me: return me.args[0], '', me.args[1] |