rbd-mirror: avoid sending duplicate re-acquire messages upon leader startup

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

diff --git a/src/tools/rbd_mirror/image_map/Policy.cc b/src/tools/rbd_mirror/image_map/Policy.cc
index a60c8fc04208ac3a4461d99651dcd06102b4c04e..03c5705b656a44196b90d6fce73738fe1e9671f9 100644 (file)
--- a/src/tools/rbd_mirror/image_map/Policy.cc
+++ b/src/tools/rbd_mirror/image_map/Policy.cc
@@ -90,6 +90,11 @@ bool Policy::add_image(const std::string &global_image_id) {
   auto image_state_result = m_image_states.emplace(global_image_id,
                                                    ImageState{});
   auto& image_state = image_state_result.first->second;
+  if (image_state.state == StateTransition::STATE_INITIALIZING) {
+    // avoid duplicate acquire notifications upon leader startup
+    return false;
+  }
+
   return set_state(&image_state, StateTransition::STATE_ASSOCIATING, false);
 }