mon: do not scrub if scrub is in progress

This prevents an assert from unexpected scrub results from the previous
scrub on the leader.

Backport: cuttlefish
Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 76efc6c21e45a719862d78a17332775750e9b1c6..b2676ec4357686fc7f8ede799dafaee015252ac6 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -4004,6 +4004,11 @@ int Monitor::scrub()
     return -EOPNOTSUPP;
   }
 
+  if (!scrub_result.empty()) {
+    clog.info() << "scrub already in progress\n";
+    return -EBUSY;
+  }
+
   scrub_result.clear();
   scrub_version = paxos->get_version();