From 84465bf5a583651436df7813d3b24857dc49460d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 25 Aug 2017 09:45:51 -0400 Subject: [PATCH] qa/standalone/scrub/osd-scrub-repair: fix grep pattern PGMap shows ss << pg_sum.stats.sum.num_objects_unfound << "/" << pg_sum.stats.sum.num_objects << " objects unfound (" << b << "%)"; but we were grepping for "1/1 unfound" instead of "1/1 objects unfound". Introduced by fe81b7e3a5034ce855303f93f3e413f3f2dc74a8. Fixes: http://tracker.ceph.com/issues/21127 Signed-off-by: Sage Weil --- qa/standalone/scrub/osd-scrub-repair.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh index 8d58c584595f..2aaaebd6e970 100755 --- a/qa/standalone/scrub/osd-scrub-repair.sh +++ b/qa/standalone/scrub/osd-scrub-repair.sh @@ -374,11 +374,11 @@ function unfound_erasure_coded() { # # it may take a bit to appear due to mon/mgr asynchrony for f in `seq 1 60`; do - ceph -s | grep "1/1 unfound" && break + ceph -s | grep "1/1 objects unfound" && break sleep 1 done ceph -s|grep "4 osds: 4 up, 4 in" || return 1 - ceph -s|grep "1/1 unfound" || return 1 + ceph -s|grep "1/1 objects unfound" || return 1 teardown $dir || return 1 } -- 2.47.3