librbd: make AttachParentRequest support reattach

Signed-off-by: Mykola Golub <mgolub@suse.com>

diff --git a/src/librbd/deep_copy/SetHeadRequest.cc b/src/librbd/deep_copy/SetHeadRequest.cc
index a5cf9059a7c9cc0359e79d30e97949cf9eeb5f82..5670ba07505bc4d870e69b5992b72784fdda346f 100644 (file)
--- a/src/librbd/deep_copy/SetHeadRequest.cc
+++ b/src/librbd/deep_copy/SetHeadRequest.cc
@@ -177,7 +177,7 @@ void SetHeadRequest<I>::send_attach_parent() {
       finish_op_ctx->complete(0);
     });
   auto req = image::AttachParentRequest<I>::create(
-    *m_image_ctx, m_parent_spec, m_parent_overlap, ctx);
+    *m_image_ctx, m_parent_spec, m_parent_overlap, false, ctx);
   req->send();
 }
 

diff --git a/src/librbd/image/AttachParentRequest.cc b/src/librbd/image/AttachParentRequest.cc
index ec82d2923e47928184e25cd2dba07c5002c4ff11..19e69594749a89f85b39614f5007d8b45401349a 100644 (file)
--- a/src/librbd/image/AttachParentRequest.cc
+++ b/src/librbd/image/AttachParentRequest.cc
@@ -1,4 +1,4 @@
-// -*- mode:C++; tab-width:8; c-basic-offattach:2; indent-tabs-mode:t -*-
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
 #include "librbd/image/AttachParentRequest.h"
@@ -17,7 +17,6 @@
 namespace librbd {
 namespace image {
 
-using util::create_context_callback;
 using util::create_rados_callback;
 
 template <typename I>
@@ -33,7 +32,7 @@ void AttachParentRequest<I>::attach_parent() {
   librados::ObjectWriteOperation op;
   if (!m_legacy_parent) {
     librbd::cls_client::parent_attach(&op, m_parent_image_spec,
-                                      m_parent_overlap);
+                                      m_parent_overlap, m_reattach);
   } else {
     librbd::cls_client::set_parent(&op, m_parent_image_spec, m_parent_overlap);
   }
@@ -51,7 +50,7 @@ void AttachParentRequest<I>::handle_attach_parent(int r) {
   auto cct = m_image_ctx.cct;
   ldout(cct, 5) << dendl;
 
-  if (!m_legacy_parent && r == -EOPNOTSUPP) {
+  if (!m_legacy_parent && r == -EOPNOTSUPP && !m_reattach) {
     if (m_parent_image_spec.pool_namespace ==
           m_image_ctx.md_ctx.get_namespace()) {
       m_parent_image_spec.pool_namespace = "";

diff --git a/src/librbd/image/AttachParentRequest.h b/src/librbd/image/AttachParentRequest.h
index de4f8ed6ef48ac8fe7dda4da6a11be7592e156e8..482e03273a0b7dc5225b90cf4fef251b74de839a 100644 (file)
--- a/src/librbd/image/AttachParentRequest.h
+++ b/src/librbd/image/AttachParentRequest.h
@@ -1,4 +1,4 @@
-// -*- mode:C++; tab-width:8; c-basic-offattach:2; indent-tabs-mode:t -*-
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
 #ifndef CEPH_LIBRBD_IMAGE_ATTACH_PARENT_REQUEST_H
@@ -23,15 +23,19 @@ public:
   static AttachParentRequest* create(ImageCtxT& image_ctx,
                                      const cls::rbd::ParentImageSpec& pspec,
                                      uint64_t parent_overlap,
+                                     bool reattach,
                                      Context* on_finish) {
-    return new AttachParentRequest(image_ctx, pspec, parent_overlap, on_finish);
+    return new AttachParentRequest(image_ctx, pspec, parent_overlap, reattach,
+                                   on_finish);
   }
 
   AttachParentRequest(ImageCtxT& image_ctx,
                       const cls::rbd::ParentImageSpec& pspec,
-                      uint64_t parent_overlap, Context* on_finish)
+                      uint64_t parent_overlap, bool reattach,
+                      Context* on_finish)
     : m_image_ctx(image_ctx), m_parent_image_spec(pspec),
-      m_parent_overlap(parent_overlap), m_on_finish(on_finish) {
+      m_parent_overlap(parent_overlap), m_reattach(reattach),
+      m_on_finish(on_finish) {
   }
 
   void send();
@@ -55,6 +59,7 @@ private:
   ImageCtxT& m_image_ctx;
   cls::rbd::ParentImageSpec m_parent_image_spec;
   uint64_t m_parent_overlap;
+  bool m_reattach;
   Context* m_on_finish;
 
   bool m_legacy_parent = false;

diff --git a/src/librbd/image/CloneRequest.cc b/src/librbd/image/CloneRequest.cc
index b89f077764b2141b0d43e054723cacf64bb68cd0..eccf7a53048e502b3c5fc6cf6275b65651ee0e30 100644 (file)
--- a/src/librbd/image/CloneRequest.cc
+++ b/src/librbd/image/CloneRequest.cc
@@ -342,7 +342,7 @@ void CloneRequest<I>::attach_parent() {
   auto ctx = create_context_callback<
     CloneRequest<I>, &CloneRequest<I>::handle_attach_parent>(this);
   auto req = AttachParentRequest<I>::create(
-    *m_imctx, m_pspec, m_size, ctx);
+    *m_imctx, m_pspec, m_size, false, ctx);
   req->send();
 }
 

diff --git a/src/test/cls_rbd/test_cls_rbd.cc b/src/test/cls_rbd/test_cls_rbd.cc
index 43d30b717b56d8e6ab71ecfb0e20e9bfc6ba5afc..f76fc0b9977b6be3bc7022dcbef6f0b032363a47 100644 (file)
--- a/src/test/cls_rbd/test_cls_rbd.cc
+++ b/src/test/cls_rbd/test_cls_rbd.cc
@@ -855,7 +855,8 @@ TEST_F(TestClsRbd, parents_v2)
   ASSERT_EQ(-ENOENT, parent_get(&ioctx, oid, &parent_image_spec));
   ASSERT_EQ(-ENOENT, parent_overlap_get(&ioctx, oid, CEPH_NOSNAP,
                                         &parent_overlap));
-  ASSERT_EQ(-ENOENT, parent_attach(&ioctx, oid, parent_image_spec, 0ULL));
+  ASSERT_EQ(-ENOENT, parent_attach(&ioctx, oid, parent_image_spec, 0ULL,
+                                   false));
   ASSERT_EQ(-ENOENT, parent_detach(&ioctx, oid));
 
   // no layering support should fail
@@ -865,7 +866,7 @@ TEST_F(TestClsRbd, parents_v2)
   ASSERT_FALSE(parent_image_spec.exists());
   ASSERT_EQ(0, parent_overlap_get(&ioctx, oid, CEPH_NOSNAP, &parent_overlap));
   ASSERT_EQ(std::nullopt, parent_overlap);
-  ASSERT_EQ(-ENOEXEC, parent_attach(&ioctx, oid, parent_image_spec, 0ULL));
+  ASSERT_EQ(-ENOEXEC, parent_attach(&ioctx, oid, parent_image_spec, 0ULL, false));
   ASSERT_EQ(-ENOEXEC, parent_detach(&ioctx, oid));
 
   // layering support available -- no pool namespaces
@@ -877,14 +878,17 @@ TEST_F(TestClsRbd, parents_v2)
   ASSERT_FALSE(parent_image_spec.exists());
   ASSERT_EQ(0, parent_overlap_get(&ioctx, oid, CEPH_NOSNAP, &parent_overlap));
   ASSERT_EQ(std::nullopt, parent_overlap);
-  ASSERT_EQ(-EINVAL, parent_attach(&ioctx, oid, parent_image_spec, 0ULL));
+  ASSERT_EQ(-EINVAL, parent_attach(&ioctx, oid, parent_image_spec, 0ULL, false));
   ASSERT_EQ(-ENOENT, parent_detach(&ioctx, oid));
 
   parent_image_spec = {1, "", "parent", 2};
   parent_overlap = (33 << 20) + 1;
-  ASSERT_EQ(0, parent_attach(&ioctx, oid, parent_image_spec, *parent_overlap));
+  ASSERT_EQ(0, parent_attach(&ioctx, oid, parent_image_spec, *parent_overlap,
+                             false));
   ASSERT_EQ(-EEXIST, parent_attach(&ioctx, oid, parent_image_spec,
-                                   *parent_overlap));
+                                   *parent_overlap, false));
+  ASSERT_EQ(0, parent_attach(&ioctx, oid, parent_image_spec, *parent_overlap,
+                             true));
   --(*parent_overlap);
 
   cls::rbd::ParentImageSpec on_disk_parent_image_spec;
@@ -925,9 +929,12 @@ TEST_F(TestClsRbd, parents_v2)
   // clone across pool namespaces
   parent_image_spec.pool_namespace = "ns";
   parent_overlap = 31 << 20;
-  ASSERT_EQ(0, parent_attach(&ioctx, oid, parent_image_spec, *parent_overlap));
+  ASSERT_EQ(0, parent_attach(&ioctx, oid, parent_image_spec, *parent_overlap,
+                             false));
   ASSERT_EQ(-EEXIST, parent_attach(&ioctx, oid, parent_image_spec,
-                                   *parent_overlap));
+                                   *parent_overlap, false));
+  ASSERT_EQ(0, parent_attach(&ioctx, oid, parent_image_spec, *parent_overlap,
+                             true));
 
   ASSERT_EQ(0, parent_get(&ioctx, oid, &on_disk_parent_image_spec));
   ASSERT_EQ(parent_image_spec, on_disk_parent_image_spec);

diff --git a/src/test/librbd/deep_copy/test_mock_SetHeadRequest.cc b/src/test/librbd/deep_copy/test_mock_SetHeadRequest.cc
index e417374049e37f932f597c27daf477b2ba923714..48c2f3b0f40b04b99e219a8582c0fe7db53e95d1 100644 (file)
--- a/src/test/librbd/deep_copy/test_mock_SetHeadRequest.cc
+++ b/src/test/librbd/deep_copy/test_mock_SetHeadRequest.cc
@@ -32,7 +32,7 @@ struct AttachParentRequest<MockTestImageCtx> {
   static AttachParentRequest* s_instance;
   static AttachParentRequest* create(MockTestImageCtx&,
                                      const cls::rbd::ParentImageSpec& pspec,
-                                     uint64_t parent_overlap,
+                                     uint64_t parent_overlap, bool reattach,
                                      Context *on_finish) {
     ceph_assert(s_instance != nullptr);
     s_instance->on_finish = on_finish;

diff --git a/src/test/librbd/image/test_mock_AttachParentRequest.cc b/src/test/librbd/image/test_mock_AttachParentRequest.cc
index 071901a8ec7b912f2b98d0daf2650fb8c7f8abf4..c8c6ca71bccb17693b26d2854d04b2a38f58dc7f 100644 (file)
--- a/src/test/librbd/image/test_mock_AttachParentRequest.cc
+++ b/src/test/librbd/image/test_mock_AttachParentRequest.cc
@@ -72,7 +72,7 @@ TEST_F(TestMockImageAttachParentRequest, ParentAttachSuccess) {
 
   C_SaferCond ctx;
   auto req = MockAttachParentRequest::create(mock_image_ctx, parent_image_spec,
-                                             234, &ctx);
+                                             234, false, &ctx);
   req->send();
   ASSERT_EQ(0, ctx.wait());
 }
@@ -91,7 +91,7 @@ TEST_F(TestMockImageAttachParentRequest, SetParentSuccess) {
 
   C_SaferCond ctx;
   auto req = MockAttachParentRequest::create(mock_image_ctx, parent_image_spec,
-                                             234, &ctx);
+                                             234, false, &ctx);
   req->send();
   ASSERT_EQ(0, ctx.wait());
 }
@@ -109,7 +109,7 @@ TEST_F(TestMockImageAttachParentRequest, ParentAttachError) {
 
   C_SaferCond ctx;
   auto req = MockAttachParentRequest::create(mock_image_ctx, parent_image_spec,
-                                             234, &ctx);
+                                             234, false, &ctx);
   req->send();
   ASSERT_EQ(-EPERM, ctx.wait());
 }
@@ -128,7 +128,7 @@ TEST_F(TestMockImageAttachParentRequest, SetParentError) {
 
   C_SaferCond ctx;
   auto req = MockAttachParentRequest::create(mock_image_ctx, parent_image_spec,
-                                             234, &ctx);
+                                             234, false, &ctx);
   req->send();
   ASSERT_EQ(-EINVAL, ctx.wait());
 }
@@ -146,7 +146,7 @@ TEST_F(TestMockImageAttachParentRequest, NamespaceUnsupported) {
 
   C_SaferCond ctx;
   auto req = MockAttachParentRequest::create(mock_image_ctx, parent_image_spec,
-                                             234, &ctx);
+                                             234, false, &ctx);
   req->send();
   ASSERT_EQ(-EXDEV, ctx.wait());
 }

diff --git a/src/test/librbd/image/test_mock_CloneRequest.cc b/src/test/librbd/image/test_mock_CloneRequest.cc
index 1333b70af004c3b52c8ca0dcee0766db30b2d852..673d7dfe2beedfc645f0dbdeddd11f00c0071f12 100644 (file)
--- a/src/test/librbd/image/test_mock_CloneRequest.cc
+++ b/src/test/librbd/image/test_mock_CloneRequest.cc
@@ -55,7 +55,7 @@ struct AttachParentRequest<MockTestImageCtx> {
   static AttachParentRequest* s_instance;
   static AttachParentRequest* create(MockTestImageCtx&,
                                      const cls::rbd::ParentImageSpec& pspec,
-                                     uint64_t parent_overlap,
+                                     uint64_t parent_overlap, bool reattach,
                                      Context *on_finish) {
     ceph_assert(s_instance != nullptr);
     s_instance->on_finish = on_finish;