Merge branch 'wip-mon-scrub'

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/mon/Monitor.cc
index 5fab64460c7d010a24fada89f9ef35f1fb9b1315,d31e0abd796f834eeb2d1b9dc691c07dc5dfe232..60caa424058b5e72e84a0f274cee8863dbce4ad0
--- 1/src/mon/Monitor.cc
--- 2/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@@ -1859,8 -1866,8 +1869,9 @@@ void Monitor::win_election(epoch_t epoc
      timecheck_start();
      health_tick_start();
      do_health_to_clog_interval();
+     scrub_event_start();
    }
 +  collect_sys_info(&metadata[rank], g_ceph_context);
  }
  
  void Monitor::lose_election(epoch_t epoch, set<int> &q, int l, uint64_t features) 
@@@ -2733,10 -2715,10 +2744,10 @@@ void Monitor::handle_command(MMonComman
      return;
    }
  
 -  if (prefix == "scrub") {
 +  if (prefix == "scrub" || prefix == "mon scrub") {
      wait_for_paxos_write();
      if (is_leader()) {
-       int r = scrub();
+       int r = scrub_start();
        reply_command(m, r, "", rdata, 0);
      } else if (is_peon()) {
        forward_request_leader(m);

diff --cc src/mon/Monitor.h
Simple merge