From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 20 Sep 2019 00:00:21 +0000 (-0400)
Subject: cls/rbd: deprecate mirror_image_status_remove method
X-Git-Tag: v15.1.0~1245^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=13f9829772273b4bee2e8c75e5df7dd487728245;p=ceph.git

cls/rbd: deprecate mirror_image_status_remove method

It has never been used by RBD mirroring and should be removed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/cls/rbd/cls_rbd.cc b/src/cls/rbd/cls_rbd.cc
index f0974939973..fc6ad0df719 100644
--- a/src/cls/rbd/cls_rbd.cc
+++ b/src/cls/rbd/cls_rbd.cc
@@ -6021,6 +6021,8 @@ int mirror_image_status_set(cls_method_context_t hctx, bufferlist *in,
  *
  * Output:
  * @returns 0 on success, negative error code on failure
+ *
+ * NOTE: deprecated - remove this method after Octopus is unsupported
  */
 int mirror_image_status_remove(cls_method_context_t hctx, bufferlist *in,
 			       bufferlist *out) {
diff --git a/src/cls/rbd/cls_rbd_client.cc b/src/cls/rbd/cls_rbd_client.cc
index 1dc1e7c7f2a..a8df333e3f7 100644
--- a/src/cls/rbd/cls_rbd_client.cc
+++ b/src/cls/rbd/cls_rbd_client.cc
@@ -2086,20 +2086,6 @@ void mirror_image_status_set(librados::ObjectWriteOperation *op,
   op->exec("rbd", "mirror_image_status_set", bl);
 }
 
-int mirror_image_status_remove(librados::IoCtx *ioctx,
-                               const std::string &global_image_id) {
-  librados::ObjectWriteOperation op;
-  mirror_image_status_remove(&op, global_image_id);
-  return ioctx->operate(RBD_MIRRORING, &op);
-}
-
-void mirror_image_status_remove(librados::ObjectWriteOperation *op,
-                                const std::string &global_image_id) {
-  bufferlist bl;
-  encode(global_image_id, bl);
-  op->exec("rbd", "mirror_image_status_remove", bl);
-}
-
 int mirror_image_status_get(librados::IoCtx *ioctx,
                             const std::string &global_image_id,
                             cls::rbd::MirrorImageStatus *status) {
diff --git a/src/cls/rbd/cls_rbd_client.h b/src/cls/rbd/cls_rbd_client.h
index 9ab63141d04..29337e7293b 100644
--- a/src/cls/rbd/cls_rbd_client.h
+++ b/src/cls/rbd/cls_rbd_client.h
@@ -438,10 +438,6 @@ int mirror_image_status_set(librados::IoCtx *ioctx,
 void mirror_image_status_set(librados::ObjectWriteOperation *op,
                              const std::string &global_image_id,
                              const cls::rbd::MirrorImageStatus &status);
-int mirror_image_status_remove(librados::IoCtx *ioctx,
-                               const std::string &global_image_id);
-void mirror_image_status_remove(librados::ObjectWriteOperation *op,
-                                const std::string &global_image_id);
 int mirror_image_status_get(librados::IoCtx *ioctx,
                             const std::string &global_image_id,
                             cls::rbd::MirrorImageStatus *status);
diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc
index e1f3834656a..7be6a642a6c 100644
--- a/src/test/cls_rbd/test_cls_rbd.cc
+++ b/src/test/cls_rbd/test_cls_rbd.cc
@@ -1939,24 +1939,6 @@ TEST_F(TestClsRbd, mirror_image_status) {
   ASSERT_EQ(1U, states.size());
   ASSERT_EQ(3, states[cls::rbd::MIRROR_IMAGE_STATUS_STATE_REPLAYING]);
 
-  // Test remove
-
-  ASSERT_EQ(0, mirror_image_status_remove(&ioctx, "uuid3"));
-  ASSERT_EQ(-ENOENT, mirror_image_status_get(&ioctx, "uuid3", &read_status));
-  images.clear();
-  statuses.clear();
-  ASSERT_EQ(0, mirror_image_status_list(&ioctx, "", 1024, &images, &statuses));
-  ASSERT_EQ(3U, images.size());
-  ASSERT_EQ(2U, statuses.size());
-  ASSERT_EQ(statuses["image_id1"], status1);
-  ASSERT_EQ(statuses["image_id2"], status2);
-
-  states.clear();
-  ASSERT_EQ(0, mirror_image_status_get_summary(&ioctx, &states));
-  ASSERT_EQ(2U, states.size());
-  ASSERT_EQ(1, states[cls::rbd::MIRROR_IMAGE_STATUS_STATE_UNKNOWN]);
-  ASSERT_EQ(2, states[cls::rbd::MIRROR_IMAGE_STATUS_STATE_REPLAYING]);
-
   // Test statuses are down after removing watcher
 
   ASSERT_EQ(0, mirror_image_status_set(&ioctx, "uuid1", status1));