Merge pull request ceph#60946 from nbalacha/wip-nbalacha-69112

cls/rbd: fix mirror_image_map_list object

Reviewed-by: Ilya Dryomov <[email protected]>

Author: idryomov

src/cls/rbd/cls_rbd_client.cc

@@ -2538,7 +2538,7 @@ int mirror_image_map_list(
   mirror_image_map_list_start(&op, start_after, max_read);
 
   bufferlist out_bl;
-  int r = ioctx->operate(RBD_MIRRORING, &op, &out_bl);
+  int r = ioctx->operate(RBD_MIRROR_LEADER, &op, &out_bl);
   if (r < 0) {
     return r;
   }

src/test/cls_rbd/test_cls_rbd.cc

@@ -2156,7 +2156,7 @@ TEST_F(TestClsRbd, mirror_image_map)
 {
   librados::IoCtx ioctx;
   ASSERT_EQ(0, _rados.ioctx_create(_pool_name.c_str(), ioctx));
-  ioctx.remove(RBD_MIRRORING);
+  ioctx.remove(RBD_MIRROR_LEADER);
 
   std::map<std::string, cls::rbd::MirrorImageMap> image_mapping;
   ASSERT_EQ(-ENOENT, mirror_image_map_list(&ioctx, "", 0, &image_mapping));
@@ -2177,7 +2177,7 @@ TEST_F(TestClsRbd, mirror_image_map)
 
       mirror_image_map_update(&op, global_image_id, mirror_image_map);
     }
-    ASSERT_EQ(0, ioctx.operate(RBD_MIRRORING, &op));
+    ASSERT_EQ(0, ioctx.operate(RBD_MIRROR_LEADER, &op));
   }
 
   ASSERT_EQ(0, mirror_image_map_list(&ioctx, "", 1000, &image_mapping));
@@ -2203,7 +2203,7 @@ TEST_F(TestClsRbd, mirror_image_map)
   librados::ObjectWriteOperation op;
   mirror_image_map_remove(&op, "1");
   mirror_image_map_update(&op, "10", expected_mirror_image_map);
-  ASSERT_EQ(0, ioctx.operate(RBD_MIRRORING, &op));
+  ASSERT_EQ(0, ioctx.operate(RBD_MIRROR_LEADER, &op));
 
   ASSERT_EQ(0, mirror_image_map_list(&ioctx, "0", 1, &image_mapping));
   ASSERT_EQ(1U, image_mapping.size());