rbd-mirror: support optionally enabling active/active mirroring

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 53b87b9d22b268e57c293e977aa8220bc2b1fddf)

diff --git a/src/common/options.cc b/src/common/options.cc
index f9c9f061c5b2d76dc2342a12fa8f580726af5c69..1d81d2c413c169be5525556d4d1b02c2c247f5a9 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -6463,9 +6463,9 @@ static std::vector<Option> get_rbd_mirror_options() {
     .set_description("number of failed attempts to acquire lock after missing heartbeats before breaking lock"),
 
     Option("rbd_mirror_image_policy_type", Option::TYPE_STR, Option::LEVEL_ADVANCED)
-    .set_default("simple")
-    .set_enum_allowed({"simple"})
-    .set_description("policy type for mapping images to instances"),
+    .set_default("none")
+    .set_enum_allowed({"none", "simple"})
+    .set_description("active/active policy type for mapping images to instances"),
 
     Option("rbd_mirror_image_policy_migration_throttle", Option::TYPE_INT, Option::LEVEL_ADVANCED)
     .set_default(300)

diff --git a/src/test/rbd_mirror/image_map/test_Policy.cc b/src/test/rbd_mirror/image_map/test_Policy.cc
index f22bae0f14ab2e47ec0ee6ea4f9236c4510cf3df..5d015537113c7f3f40a10c9b786de723189a7771 100644 (file)
--- a/src/test/rbd_mirror/image_map/test_Policy.cc
+++ b/src/test/rbd_mirror/image_map/test_Policy.cc
@@ -26,7 +26,7 @@ public:
     CephContext *cct = reinterpret_cast<CephContext *>(m_local_io_ctx.cct());
     std::string policy_type = cct->_conf->get_val<string>("rbd_mirror_image_policy_type");
 
-    if (policy_type == "simple") {
+    if (policy_type == "none" || policy_type == "simple") {
       m_policy = image_map::SimplePolicy::create(m_local_io_ctx);
     } else {
       assert(false);

diff --git a/src/test/rbd_mirror/test_mock_ImageMap.cc b/src/test/rbd_mirror/test_mock_ImageMap.cc
index 3edfd1517ae891eb569131fefa60d30a566c20f2..6466fe32bdadb620f98501b0400225148e17b35b 100644 (file)
--- a/src/test/rbd_mirror/test_mock_ImageMap.cc
+++ b/src/test/rbd_mirror/test_mock_ImageMap.cc
@@ -169,8 +169,17 @@ public:
   void SetUp() override {
     TestFixture::SetUp();
 
+    m_local_instance_id = stringify(m_local_io_ctx.get_instance_id());
+
     EXPECT_EQ(0, _rados->conf_set("rbd_mirror_image_policy_migration_throttle",
                                   "0"));
+    EXPECT_EQ(0, _rados->conf_set("rbd_mirror_image_policy_type", "simple"));
+  }
+
+  void TearDown() override {
+    EXPECT_EQ(0, _rados->conf_set("rbd_mirror_image_policy_type", "none"));
+
+    TestFixture::TearDown();
   }
 
   void expect_work_queue(MockThreads &mock_threads) {
@@ -401,6 +410,7 @@ public:
   Cond m_cond;
   uint32_t m_notify_update_count;
   uint32_t m_map_update_count;
+  std::string m_local_instance_id;
 };
 
 TEST_F(TestMockImageMap, SetLocalImages) {
@@ -415,7 +425,8 @@ TEST_F(TestMockImageMap, SetLocalImages) {
   MockListener mock_listener(this);
 
   std::unique_ptr<MockImageMap> mock_image_map{
-    MockImageMap::create(m_local_io_ctx, &mock_threads, mock_listener)};
+    MockImageMap::create(m_local_io_ctx, &mock_threads, m_local_instance_id,
+                         mock_listener)};
 
   C_SaferCond cond;
   mock_image_map->init(&cond);
@@ -460,7 +471,8 @@ TEST_F(TestMockImageMap, AddRemoveLocalImage) {
   MockListener mock_listener(this);
 
   std::unique_ptr<MockImageMap> mock_image_map{
-    MockImageMap::create(m_local_io_ctx, &mock_threads, mock_listener)};
+    MockImageMap::create(m_local_io_ctx, &mock_threads, m_local_instance_id,
+                         mock_listener)};
 
   C_SaferCond cond;
   mock_image_map->init(&cond);
@@ -525,7 +537,8 @@ TEST_F(TestMockImageMap, AddRemoveRemoteImage) {
   MockListener mock_listener(this);
 
   std::unique_ptr<MockImageMap> mock_image_map{
-    MockImageMap::create(m_local_io_ctx, &mock_threads, mock_listener)};
+    MockImageMap::create(m_local_io_ctx, &mock_threads, m_local_instance_id,
+                         mock_listener)};
 
   C_SaferCond cond;
   mock_image_map->init(&cond);
@@ -596,7 +609,8 @@ TEST_F(TestMockImageMap, AddRemoveRemoteImageDuplicateNotification) {
   MockListener mock_listener(this);
 
   std::unique_ptr<MockImageMap> mock_image_map{
-    MockImageMap::create(m_local_io_ctx, &mock_threads, mock_listener)};
+    MockImageMap::create(m_local_io_ctx, &mock_threads, m_local_instance_id,
+                         mock_listener)};
 
   C_SaferCond cond;
   mock_image_map->init(&cond);
@@ -674,7 +688,8 @@ TEST_F(TestMockImageMap, AcquireImageErrorRetry) {
   MockListener mock_listener(this);
 
   std::unique_ptr<MockImageMap> mock_image_map{
-    MockImageMap::create(m_local_io_ctx, &mock_threads, mock_listener)};
+    MockImageMap::create(m_local_io_ctx, &mock_threads, m_local_instance_id,
+                         mock_listener)};
 
   C_SaferCond cond;
   mock_image_map->init(&cond);
@@ -724,7 +739,8 @@ TEST_F(TestMockImageMap, RemoveRemoteAndLocalImage) {
   MockListener mock_listener(this);
 
   std::unique_ptr<MockImageMap> mock_image_map{
-    MockImageMap::create(m_local_io_ctx, &mock_threads, mock_listener)};
+    MockImageMap::create(m_local_io_ctx, &mock_threads, m_local_instance_id,
+                         mock_listener)};
 
   C_SaferCond cond;
   mock_image_map->init(&cond);
@@ -815,7 +831,8 @@ TEST_F(TestMockImageMap, AddInstance) {
   MockListener mock_listener(this);
 
   std::unique_ptr<MockImageMap> mock_image_map{
-    MockImageMap::create(m_local_io_ctx, &mock_threads, mock_listener)};
+    MockImageMap::create(m_local_io_ctx, &mock_threads, m_local_instance_id,
+                         mock_listener)};
 
   C_SaferCond cond;
   mock_image_map->init(&cond);
@@ -846,8 +863,7 @@ TEST_F(TestMockImageMap, AddInstance) {
                          &peer_ack_ctxs);
   wait_for_scheduled_task();
 
-  auto local_instance_id = stringify(m_local_io_ctx.get_instance_id());
-  mock_image_map->update_instances_added({local_instance_id});
+  mock_image_map->update_instances_added({m_local_instance_id});
 
   std::set<std::string> shuffled_global_image_ids;
 
@@ -887,7 +903,8 @@ TEST_F(TestMockImageMap, RemoveInstance) {
   MockListener mock_listener(this);
 
   std::unique_ptr<MockImageMap> mock_image_map{
-    MockImageMap::create(m_local_io_ctx, &mock_threads, mock_listener)};
+    MockImageMap::create(m_local_io_ctx, &mock_threads, m_local_instance_id,
+                         mock_listener)};
 
   C_SaferCond cond;
   mock_image_map->init(&cond);
@@ -919,8 +936,7 @@ TEST_F(TestMockImageMap, RemoveInstance) {
                          &peer_ack_ctxs);
   wait_for_scheduled_task();
 
-  auto local_instance_id = stringify(m_local_io_ctx.get_instance_id());
-  mock_image_map->update_instances_added({local_instance_id});
+  mock_image_map->update_instances_added({m_local_instance_id});
 
   std::set<std::string> shuffled_global_image_ids;
 
@@ -985,10 +1001,9 @@ TEST_F(TestMockImageMap, AddInstancePingPongImageTest) {
     "global id 11", "global id 12", "global id 13", "global id 14"
   };
 
-  auto local_instance_id = stringify(m_local_io_ctx.get_instance_id());
   std::map<std::string, cls::rbd::MirrorImageMap> image_mapping;
   for (auto& global_image_id : global_image_ids) {
-    image_mapping[global_image_id] = {local_instance_id, {}, {}};
+    image_mapping[global_image_id] = {m_local_instance_id, {}, {}};
   }
 
   // ACQUIRE
@@ -1006,13 +1021,14 @@ TEST_F(TestMockImageMap, AddInstancePingPongImageTest) {
                           &peer_ack_ctxs);
 
   std::unique_ptr<MockImageMap> mock_image_map{
-    MockImageMap::create(m_local_io_ctx, &mock_threads, mock_listener)};
+    MockImageMap::create(m_local_io_ctx, &mock_threads, m_local_instance_id,
+                         mock_listener)};
 
   C_SaferCond cond;
   mock_image_map->init(&cond);
   ASSERT_EQ(0, cond.wait());
 
-  mock_image_map->update_instances_added({local_instance_id});
+  mock_image_map->update_instances_added({m_local_instance_id});
 
   std::set<std::string> global_image_ids_ack(global_image_ids);
 
@@ -1111,7 +1127,8 @@ TEST_F(TestMockImageMap, RemoveInstanceWithRemoveImage) {
   MockListener mock_listener(this);
 
   std::unique_ptr<MockImageMap> mock_image_map{
-    MockImageMap::create(m_local_io_ctx, &mock_threads, mock_listener)};
+    MockImageMap::create(m_local_io_ctx, &mock_threads, m_local_instance_id,
+                         mock_listener)};
 
   C_SaferCond cond;
   mock_image_map->init(&cond);
@@ -1146,8 +1163,7 @@ TEST_F(TestMockImageMap, RemoveInstanceWithRemoveImage) {
                          &peer_ack_ctxs);
   wait_for_scheduled_task();
 
-  auto local_instance_id = stringify(m_local_io_ctx.get_instance_id());
-  mock_image_map->update_instances_added({local_instance_id});
+  mock_image_map->update_instances_added({m_local_instance_id});
 
   std::set<std::string> shuffled_global_image_ids;
 
@@ -1212,14 +1228,14 @@ TEST_F(TestMockImageMap, AddErrorAndRemoveImage) {
   MockListener mock_listener(this);
 
   std::unique_ptr<MockImageMap> mock_image_map{
-    MockImageMap::create(m_local_io_ctx, &mock_threads, mock_listener)};
+    MockImageMap::create(m_local_io_ctx, &mock_threads, m_local_instance_id,
+                         mock_listener)};
 
   C_SaferCond cond;
   mock_image_map->init(&cond);
   ASSERT_EQ(0, cond.wait());
 
-  auto local_instance_id = stringify(m_local_io_ctx.get_instance_id());
-  mock_image_map->update_instances_added({local_instance_id});
+  mock_image_map->update_instances_added({m_local_instance_id});
 
   std::set<std::string> global_image_ids{
     "global id 1", "global id 2", "global id 3", "remote id 4",
@@ -1326,7 +1342,8 @@ TEST_F(TestMockImageMap, MirrorUUIDUpdated) {
   MockListener mock_listener(this);
 
   std::unique_ptr<MockImageMap> mock_image_map{
-    MockImageMap::create(m_local_io_ctx, &mock_threads, mock_listener)};
+    MockImageMap::create(m_local_io_ctx, &mock_threads, m_local_instance_id,
+                         mock_listener)};
 
   C_SaferCond cond;
   mock_image_map->init(&cond);

diff --git a/src/tools/rbd_mirror/ImageMap.cc b/src/tools/rbd_mirror/ImageMap.cc
index 5a674c9c67c4af0511b38671efe4578d8426b106..2ec371892f5d620fd2988514c6b49d2dfe8ea8dd 100644 (file)
--- a/src/tools/rbd_mirror/ImageMap.cc
+++ b/src/tools/rbd_mirror/ImageMap.cc
@@ -53,9 +53,10 @@ struct ImageMap<I>::C_NotifyInstance : public Context {
 };
 
 template <typename I>
-ImageMap<I>::ImageMap(librados::IoCtx &ioctx, Threads<I> *threads, image_map::Listener &listener)
-  : m_ioctx(ioctx),
-    m_threads(threads),
+ImageMap<I>::ImageMap(librados::IoCtx &ioctx, Threads<I> *threads,
+                      const std::string& instance_id,
+                      image_map::Listener &listener)
+  : m_ioctx(ioctx), m_threads(threads), m_instance_id(instance_id),
     m_listener(listener),
     m_lock(unique_lock_name("rbd::mirror::ImageMap::m_lock", this)) {
 }
@@ -160,12 +161,15 @@ void ImageMap<I>::process_updates() {
     image_map::ActionType action_type =
       m_policy->start_action(global_image_id);
     image_map::LookupInfo info = m_policy->lookup(global_image_id);
-    assert(info.instance_id != image_map::UNMAPPED_INSTANCE_ID);
 
+    dout(15) << "global_image_id=" << global_image_id << ", "
+             << "action=" << action_type << ", "
+             << "instance=" << info.instance_id << dendl;
     switch (action_type) {
     case image_map::ACTION_TYPE_NONE:
       continue;
     case image_map::ACTION_TYPE_MAP_UPDATE:
+      assert(info.instance_id != image_map::UNMAPPED_INSTANCE_ID);
       map_updates.emplace_back(global_image_id, info.instance_id,
                                info.mapped_time);
       break;
@@ -173,9 +177,11 @@ void ImageMap<I>::process_updates() {
       map_removals.emplace(global_image_id);
       break;
     case image_map::ACTION_TYPE_ACQUIRE:
+      assert(info.instance_id != image_map::UNMAPPED_INSTANCE_ID);
       acquire_updates.emplace_back(global_image_id, info.instance_id);
       break;
     case image_map::ACTION_TYPE_RELEASE:
+      assert(info.instance_id != image_map::UNMAPPED_INSTANCE_ID);
       release_updates.emplace_back(global_image_id, info.instance_id);
       break;
     }
@@ -366,16 +372,22 @@ void ImageMap<I>::update_images_removed(
 template <typename I>
 void ImageMap<I>::update_instances_added(
     const std::vector<std::string> &instance_ids) {
-  dout(20) << dendl;
-
   {
     Mutex::Locker locker(m_lock);
     if (m_shutting_down) {
       return;
     }
 
+    std::vector<std::string> filtered_instance_ids;
+    filter_instance_ids(instance_ids, &filtered_instance_ids, false);
+    if (filtered_instance_ids.empty()) {
+      return;
+    }
+
+    dout(20) << "instance_ids=" << filtered_instance_ids << dendl;
+
     std::set<std::string> remap_global_image_ids;
-    m_policy->add_instances(instance_ids, &remap_global_image_ids);
+    m_policy->add_instances(filtered_instance_ids, &remap_global_image_ids);
 
     for (auto const &global_image_id : remap_global_image_ids) {
       schedule_action(global_image_id);
@@ -388,16 +400,22 @@ void ImageMap<I>::update_instances_added(
 template <typename I>
 void ImageMap<I>::update_instances_removed(
     const std::vector<std::string> &instance_ids) {
-  dout(20) << dendl;
-
   {
     Mutex::Locker locker(m_lock);
     if (m_shutting_down) {
       return;
     }
 
+    std::vector<std::string> filtered_instance_ids;
+    filter_instance_ids(instance_ids, &filtered_instance_ids, true);
+    if (filtered_instance_ids.empty()) {
+      return;
+    }
+
+    dout(20) << "instance_ids=" << filtered_instance_ids << dendl;
+
     std::set<std::string> remap_global_image_ids;
-    m_policy->remove_instances(instance_ids, &remap_global_image_ids);
+    m_policy->remove_instances(filtered_instance_ids, &remap_global_image_ids);
 
     for (auto const &global_image_id : remap_global_image_ids) {
       schedule_action(global_image_id);
@@ -447,7 +465,7 @@ void ImageMap<I>::init(Context *on_finish) {
   CephContext *cct = reinterpret_cast<CephContext *>(m_ioctx.cct());
   std::string policy_type = cct->_conf->get_val<string>("rbd_mirror_image_policy_type");
 
-  if (policy_type == "simple") {
+  if (policy_type == "none" || policy_type == "simple") {
     m_policy.reset(image_map::SimplePolicy::create(m_ioctx));
   } else {
     assert(false); // not really needed as such, but catch it.
@@ -486,6 +504,32 @@ void ImageMap<I>::shut_down(Context *on_finish) {
   wait_for_async_ops(on_finish);
 }
 
+template <typename I>
+void ImageMap<I>::filter_instance_ids(
+    const std::vector<std::string> &instance_ids,
+    std::vector<std::string> *filtered_instance_ids, bool removal) const {
+  CephContext *cct = reinterpret_cast<CephContext *>(m_ioctx.cct());
+  std::string policy_type = cct->_conf->get_val<string>("rbd_mirror_image_policy_type");
+
+  if (policy_type != "none") {
+    *filtered_instance_ids = instance_ids;
+    return;
+  }
+
+  if (removal) {
+    // propagate removals for external instances
+    for (auto& instance_id : instance_ids) {
+      if (instance_id != m_instance_id) {
+        filtered_instance_ids->push_back(instance_id);
+      }
+    }
+  } else if (std::find(instance_ids.begin(), instance_ids.end(),
+                       m_instance_id) != instance_ids.end()) {
+    // propagate addition only for local instance
+    filtered_instance_ids->push_back(m_instance_id);
+  }
+}
+
 } // namespace mirror
 } // namespace rbd
 

diff --git a/src/tools/rbd_mirror/ImageMap.h b/src/tools/rbd_mirror/ImageMap.h
index 28842a3aafe2a95fc135e7d85cc733ec18dd71bd..f3a9d71e26574bf64e25c36a7af74bb65997d61c 100644 (file)
--- a/src/tools/rbd_mirror/ImageMap.h
+++ b/src/tools/rbd_mirror/ImageMap.h
@@ -26,8 +26,9 @@ template <typename ImageCtxT = librbd::ImageCtx>
 class ImageMap {
 public:
   static ImageMap *create(librados::IoCtx &ioctx, Threads<ImageCtxT> *threads,
+                          const std::string& instance_id,
                           image_map::Listener &listener) {
-    return new ImageMap(ioctx, threads, listener);
+    return new ImageMap(ioctx, threads, instance_id, listener);
   }
 
   ~ImageMap();
@@ -51,7 +52,7 @@ private:
   struct C_NotifyInstance;
 
   ImageMap(librados::IoCtx &ioctx, Threads<ImageCtxT> *threads,
-           image_map::Listener &listener);
+           const std::string& instance_id, image_map::Listener &listener);
 
   struct Update {
     std::string global_image_id;
@@ -82,6 +83,7 @@ private:
 
   librados::IoCtx &m_ioctx;
   Threads<ImageCtxT> *m_threads;
+  std::string m_instance_id;
   image_map::Listener &m_listener;
 
   std::unique_ptr<image_map::Policy> m_policy; // our mapping policy
@@ -154,6 +156,11 @@ private:
                            const std::set<std::string> &global_image_ids);
   void update_images_removed(const std::string &peer_uuid,
                              const std::set<std::string> &global_image_ids);
+
+  void filter_instance_ids(const std::vector<std::string> &instance_ids,
+                           std::vector<std::string> *filtered_instance_ids,
+                           bool removal) const;
+
 };
 
 } // namespace mirror

diff --git a/src/tools/rbd_mirror/PoolReplayer.cc b/src/tools/rbd_mirror/PoolReplayer.cc
index 7dee40a30b832661d9f1835d9d7d170e54744b9b..b6f30ee3b31a80d9166c3c4a25b3e16f4d951fd8 100644 (file)
--- a/src/tools/rbd_mirror/PoolReplayer.cc
+++ b/src/tools/rbd_mirror/PoolReplayer.cc
@@ -729,6 +729,7 @@ void PoolReplayer<I>::init_image_map(Context *on_finish) {
   Mutex::Locker locker(m_lock);
   assert(!m_image_map);
   m_image_map.reset(ImageMap<I>::create(m_local_io_ctx, m_threads,
+                                        m_instance_watcher->get_instance_id(),
                                         m_image_map_listener));
 
   auto ctx = new FunctionContext([this, on_finish](int r) {
@@ -1030,16 +1031,15 @@ template <typename I>
 void PoolReplayer<I>::handle_instances_added(const InstanceIds &instance_ids) {
   dout(5) << "instance_ids=" << instance_ids << dendl;
 
-  // TODO only register ourselves for now
-  auto instance_id = m_instance_watcher->get_instance_id();
-  m_image_map->update_instances_added({instance_id});
+  m_image_map->update_instances_added(instance_ids);
 }
 
 template <typename I>
 void PoolReplayer<I>::handle_instances_removed(
     const InstanceIds &instance_ids) {
   dout(5) << "instance_ids=" << instance_ids << dendl;
-  // TODO
+
+  m_image_map->update_instances_removed(instance_ids);
 }
 
 } // namespace mirror

diff --git a/src/tools/rbd_mirror/image_map/Policy.cc b/src/tools/rbd_mirror/image_map/Policy.cc
index fe7d66931c33af8bba1154d8a74ce214005d3bcc..c1e69e774c4507508d7133365646c4df6ccd615a 100644 (file)
--- a/src/tools/rbd_mirror/image_map/Policy.cc
+++ b/src/tools/rbd_mirror/image_map/Policy.cc
@@ -53,6 +53,7 @@ void Policy::init(
 
   RWLock::WLocker map_lock(m_map_lock);
   for (auto& it : image_mapping) {
+    assert(!it.second.instance_id.empty());
     auto map_result = m_map[it.second.instance_id].emplace(it.first);
     assert(map_result.second);
 
@@ -111,6 +112,7 @@ void Policy::add_instances(const InstanceIds &instance_ids,
 
   RWLock::WLocker map_lock(m_map_lock);
   for (auto& instance : instance_ids) {
+    assert(!instance.empty());
     m_map.emplace(instance, std::set<std::string>{});
   }
 
@@ -286,6 +288,7 @@ void Policy::map(const std::string& global_image_id, ImageState* image_state) {
   }
 
   instance_id = do_map(m_map, global_image_id);
+  assert(!instance_id.empty());
   dout(5) << "global_image_id=" << global_image_id << ", "
           << "instance_id=" << instance_id << dendl;
 
@@ -308,6 +311,7 @@ void Policy::unmap(const std::string &global_image_id,
   dout(5) << "global_image_id=" << global_image_id << ", "
           << "instance_id=" << instance_id << dendl;
 
+  assert(!instance_id.empty());
   m_map[instance_id].erase(global_image_id);
   image_state->instance_id = UNMAPPED_INSTANCE_ID;
   image_state->mapped_time = {};