]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd-mirror: spell out "remote image is not primary" status correctly 46759/head
authorIlya Dryomov <idryomov@gmail.com>
Sat, 18 Jun 2022 13:25:49 +0000 (15:25 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Mon, 20 Jun 2022 17:47:18 +0000 (19:47 +0200)
There is a difference: non-primary means NON_PRIMARY promotion state,
while "not primary" can refer to any of NON_PRIMARY, ORPHAN or UNKNOWN
promotion states.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
src/tools/rbd_mirror/ImageReplayer.cc

index cec1f5463e6065f75610349d5a37f14086d1ca67..ee22b8d3475d59b9a037e23dcd0e331d1c349b23 100644 (file)
@@ -385,8 +385,8 @@ void ImageReplayer<I>::handle_bootstrap(int r) {
     on_start_fail(0, "local image is primary");
     return;
   } else if (r == -EREMOTEIO) {
-    dout(5) << "remote image is non-primary" << dendl;
-    on_start_fail(-EREMOTEIO, "remote image is non-primary");
+    dout(5) << "remote image is noprimary" << dendl;
+    on_start_fail(-EREMOTEIO, "remote image is noprimary");
     return;
   } else if (r == -EEXIST) {
     on_start_fail(r, "split-brain detected");