]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: check cephfs mirror peer based on remote cluster spec and file system name
authorVenky Shankar <vshankar@redhat.com>
Tue, 16 Mar 2021 05:27:14 +0000 (01:27 -0400)
committerVenky Shankar <vshankar@redhat.com>
Tue, 23 Mar 2021 04:16:19 +0000 (09:46 +0530)
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit b625c2634d7c8c8b78e43bc5c9d22b2fa2b8fccc)

src/mon/FSCommands.cc

index 63ab1594642df290cae3ea7ededf3b510af5bb2b..b2c8e1935bf558335e815669d1d9ef836a8ab47f 100644 (file)
@@ -1150,6 +1150,11 @@ public:
       ss << "peer already exists";
       return true;
     }
+    if (fs->mirror_info.has_peer((*remote_conf).first, (*remote_conf).second,
+                                 remote_fs_name)) {
+      ss << "peer already exists";
+      return true;
+    }
 
     auto f = [peer_uuid, remote_conf, remote_fs_name](auto &&fs) {
                fs->mirror_info.peer_add(peer_uuid, (*remote_conf).first,