From: Joao Eduardo Luis <joao@suse.de>
Date: Thu, 16 Jul 2015 15:46:32 +0000 (+0100)
Subject: Merge branch 'wip-mon-scrub'
X-Git-Tag: v9.0.3~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c2d6e3d666c782a1d356bc03060ffd730b3ed902;p=ceph.git

Merge branch 'wip-mon-scrub'

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

c2d6e3d666c782a1d356bc03060ffd730b3ed902
diff --cc src/mon/Monitor.cc
index 5fab64460c7d,d31e0abd796f..60caa424058b
--- a/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);