mon: Monitor: rework scrub (1)

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

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index be0bf9732652f4d5a0684c14b463595e9669707e..f91cf472465bebbc6b6b60682bafa91568561866 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -244,6 +244,7 @@ OPTION(mon_data_avail_crit, OPT_INT, 5)
 OPTION(mon_data_avail_warn, OPT_INT, 30)
 OPTION(mon_data_size_warn, OPT_U64, 15*1024*1024*1024) // issue a warning when the monitor's data store goes over 15GB (in bytes)
 OPTION(mon_scrub_interval, OPT_INT, 3600*24) // once a day
+OPTION(mon_scrub_max_keys, OPT_INT, -1) // max number of keys to scrub each time
 OPTION(mon_config_key_max_entry_size, OPT_INT, 4096) // max num bytes per config-key entry
 OPTION(mon_sync_timeout, OPT_DOUBLE, 60.0)
 OPTION(mon_sync_max_payload_size, OPT_U32, 1048576) // max size for a sync chunk payload (say, 1MB)

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index c12affdc24e1f6a3fe237952b9cce381048d51a2..1284b385930babb8736f7769a75d837d66274f81 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -4221,8 +4221,14 @@ int Monitor::scrub()
     messenger->send_message(r, monmap->get_inst(*p));
   }
 
+  scrub_state.reset(new ScrubState);
+
   // scrub my keys
-  _scrub(&scrub_result[rank]);
+  pair<string,string> start;
+  bool r = _scrub(&scrub_result[rank], start, cct->_conf->mon_scrub_max_keys);
+  assert(!r);
+
+  scrub_state.reset();
 
   if (scrub_result.size() == quorum.size())
     scrub_finish();
@@ -4241,7 +4247,8 @@ void Monitor::handle_scrub(MMonScrub *m)
       if (m->version != paxos->get_version())
        break;
       MMonScrub *reply = new MMonScrub(MMonScrub::OP_RESULT, m->version);
-      _scrub(&reply->result);
+      pair<string,string> start;
+      _scrub(&reply->result, start, cct->_conf->mon_scrub_max_keys);
       m->get_connection()->send_message(reply);
     }
     break;
@@ -4264,23 +4271,24 @@ void Monitor::handle_scrub(MMonScrub *m)
   m->put();
 }
 
-void Monitor::_scrub(ScrubResult *r)
+bool Monitor::_scrub(ScrubResult *r,
+                     pair<string,string> &start,
+                     int num_keys)
 {
   set<string> prefixes = get_sync_targets_names();
   prefixes.erase("paxos");  // exclude paxos, as this one may have extra states for proposals, etc.
 
   dout(10) << __func__ << " prefixes " << prefixes << dendl;
 
-  if (scrub_state) {
-    dout(10) << __func__ << " scrub already in progress" << dendl;
-    return;
-  }
+  MonitorDBStore::Synchronizer it = store->get_synchronizer(start, prefixes);
 
-  scrub_state.reset(new ScrubState);
-  MonitorDBStore::Synchronizer it =
-    store->get_synchronizer(scrub_state->last_key, prefixes);
+  int scrubbed_keys = 0;
 
   while (it->has_next_chunk()) {
+
+    if (num_keys > 0 && scrubbed_keys == num_keys)
+      break;
+
     pair<string,string> k = it->get_next_key();
     bufferlist bl;
     store->get(k.first, k.second, bl);
@@ -4290,9 +4298,11 @@ void Monitor::_scrub(ScrubResult *r)
       r->prefix_crc[k.first] = 0;
     r->prefix_crc[k.first] = bl.crc32c(r->prefix_crc[k.first]);
   }
-  scrub_state->last_key = it->get_last_key();
 
-  scrub_state.reset();
+  if (scrub_state) // leader
+    scrub_state->last_key = it->get_last_key();
+
+  return it->has_next_chunk();
 }
 
 void Monitor::scrub_finish()

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index 578ddf50fb2cea08cc1099c61288bdda7e62fc57..18317990e57aea8ed4c8f7aea0a9b6c9de223c7a 100644 (file)
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -244,7 +244,9 @@ private:
    */
   int scrub();
   void handle_scrub(MMonScrub *m);
-  void _scrub(ScrubResult *r);
+  bool _scrub(ScrubResult *r,
+              pair<string,string> &start,
+              int num_keys);
   void scrub_finish();
   void scrub_reset();