mon: Monitor: wait_for_paxos() before scrubbing

Signed-off-by: Joao Eduardo Luis <joao@suse.de>

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 862d92b3c89645c95aaf3f3c0f23e10d41a21379..a5e623d04bbb83eb712303cd97f6a1272027e866 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -4210,7 +4210,6 @@ int Monitor::scrub_start()
   }
 
   scrub_result.clear();
-  scrub_version = paxos->get_version();
   scrub_state.reset(new ScrubState);
 
   scrub();
@@ -4222,6 +4221,9 @@ int Monitor::scrub()
   assert(is_leader());
   assert(scrub_state);
 
+  wait_for_paxos_write();
+  scrub_version = paxos->get_version();
+
   // scrub all keys if we're the only monitor in the quorum
   int32_t num_keys =
     (quorum.size() == 1 ? -1 : cct->_conf->mon_scrub_max_keys);
@@ -4259,6 +4261,9 @@ void Monitor::handle_scrub(MMonScrub *m)
     {
       if (!is_peon())
        break;
+
+      wait_for_paxos_write();
+
       if (m->version != paxos->get_version())
        break;