From 2548ad8b6789ff206e9cceeca8c1779508a3b609 Mon Sep 17 00:00:00 2001
From: Xinze Chi <xinze@xsky.com>
Date: Wed, 25 Nov 2015 20:19:54 +0800
Subject: [PATCH] test: fix osd-scrub-snaps.sh

when we run run-make-check.sh in hdd disk, it would spend much more
time to finish scrub.

Signed-off-by: Xinze Chi <xinze@xsky.com>
---
 src/test/osd/osd-scrub-snaps.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/test/osd/osd-scrub-snaps.sh b/src/test/osd/osd-scrub-snaps.sh
index 9819c043834d..954acfddbb73 100755
--- a/src/test/osd/osd-scrub-snaps.sh
+++ b/src/test/osd/osd-scrub-snaps.sh
@@ -150,17 +150,15 @@ function TEST_scrub_snaps() {
     run_osd $dir 0 || return 1
     wait_for_clean || return 1
 
-    sleep 5
-    ceph pg scrub ${poolid}.0
-    timeout 30 ceph -w
+    local pgid="${poolid}.0"
+    pg_scrub "$pgid" || return 1
+    grep 'log_channel' $dir/osd.0.log
 
     for i in `seq 1 7`
     do
         rados -p $poolname rmsnap snap$i
     done
 
-    sleep 10
-
     ERRORS=0
 
     pidfile=$(find $dir 2>/dev/null | grep $name_prefix'[^/]*\.pid')
-- 
2.47.3