osd: log when scrub,deep scrub, repair starts

So it can be matched, in the logs, with the log messages announcing it
is complete.

http://tracker.ceph.com/issues/9817 Fixes: #9817

Signed-off-by: Loic Dachary <loic-201408@dachary.org>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 7ef000ee1b1a790b2a65f22cf2b8b2d2e7437bd5..d043fb1d207fc950adf29e4122ffce1544ea6a86 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3838,6 +3838,14 @@ void PG::chunky_scrub(ThreadPool::TPHandle &handle)
         scrubber.start = hobject_t();
         scrubber.state = PG::Scrubber::NEW_CHUNK;
 
+       {
+         bool repair = state_test(PG_STATE_REPAIR);
+         bool deep_scrub = state_test(PG_STATE_DEEP_SCRUB);
+         const char *mode = (repair ? "repair": (deep_scrub ? "deep-scrub" : "scrub"));
+         stringstream oss;
+         oss << info.pgid.pgid << " " << mode << " starts" << std::endl;
+         osd->clog->info(oss);
+       }
         break;
 
       case PG::Scrubber::NEW_CHUNK:

diff --git a/src/test/osd/osd-scrub-repair.sh b/src/test/osd/osd-scrub-repair.sh
index 0c805b0b69e39c8ce5d7d09d51153ed1807b360e..324d6874f865c3e49fa12b6ecdd704e8af21613b 100755 (executable)
--- a/src/test/osd/osd-scrub-repair.sh
+++ b/src/test/osd/osd-scrub-repair.sh
@@ -40,6 +40,34 @@ function run() {
     teardown $dir || return 1
 }
 
+function wait_for_repair() {
+    local dir=$1
+    local primary=$2
+    local pg=$3
+    local -i tries=0
+    while [ $tries -lt 100 ] ; do
+        CEPH_ARGS='' ./ceph --admin-daemon $dir/ceph-osd.$primary.asok log flush || return 1
+        if grep --quiet "$pg repair ok" $dir/osd-$primary.log ; then
+            return 0
+        fi
+        let tries++
+        sleep 1
+    done
+    grep --quiet "$pg repair ok" $dir/osd-$primary.log || return 1
+}
+
+function TEST_log_repair() {
+    local dir=$1
+    local poolname=rbd
+    local pg=$(get_pg $poolname SOMETHING)
+    local -a osds=($(get_osds $poolname SOMETHING))
+    local primary=${osds[$first]}
+
+    ./ceph pg repair $pg
+    wait_for_repair $dir $primary $pg 
+    grep --quiet "$pg repair starts" $dir/osd-$primary.log || return 1
+}
+
 # 
 # 1) add an object 
 # 2) remove the corresponding file from the primary OSD