import ceph 16.2.7

[ceph.git] / ceph / src / tools / rbd_mirror / image_map / Policy.cc

diff --git a/ceph/src/tools/rbd_mirror/image_map/Policy.cc b/ceph/src/tools/rbd_mirror/image_map/Policy.cc
index ccf188742a10705c74c8b4687ef8b74fb9663368..62fbd12dc0bc8df4f83396815932572dc79134c2 100644 (file)
--- a/ceph/src/tools/rbd_mirror/image_map/Policy.cc
+++ b/ceph/src/tools/rbd_mirror/image_map/Policy.cc
@@ -380,6 +380,7 @@ bool Policy::can_shuffle_image(const std::string &global_image_id) {
 bool Policy::set_state(ImageState* image_state, StateTransition::State state,
                        bool ignore_current_state) {
   if (!ignore_current_state && image_state->state == state) {
+    image_state->next_state = boost::none;
     return false;
   } else if (StateTransition::is_idle(image_state->state)) {
     image_state->state = state;