From: David Zafman <dzafman@redhat.com>
Date: Thu, 25 Apr 2019 03:39:02 +0000 (-0700)
Subject: test: osd-backfill-spsace.sh doesn't matter which PG wins the race
X-Git-Tag: v14.2.3~83^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F28187%2Fhead;p=ceph.git

test: osd-backfill-spsace.sh doesn't matter which PG wins the race

Fixes: http://tracker.ceph.com/issues/39333

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 9931023457b46c2b605fdfb5b1e76f40f525cd36)
---

diff --git a/qa/standalone/osd/osd-backfill-space.sh b/qa/standalone/osd/osd-backfill-space.sh
index ba86fdc14df..936043250ed 100755
--- a/qa/standalone/osd/osd-backfill-space.sh
+++ b/qa/standalone/osd/osd-backfill-space.sh
@@ -408,8 +408,8 @@ function TEST_backfill_test_sametarget() {
 # With fillpool down write 2611 byte objects 
 # Take down $osd and bring back $fillosd simultaneously
 # Wait for backfilling
-# PG 2.0 will be able to backfill its remaining data
-# PG 3.0 must get backfill_toofull
+# One PG will be able to backfill its remaining data
+# One PG must get backfill_toofull
 function TEST_backfill_multi_partial() {
     local dir=$1
     local EC=$2
@@ -507,15 +507,15 @@ function TEST_backfill_multi_partial() {
     ceph pg dump pgs
 
     ERRORS=0
-    if [ "$(ceph pg dump pgs | grep "^3.0" | grep +backfill_toofull | wc -l)" != "1" ];
+    if [ "$(get_num_in_state backfill_toofull)" != "1" ];
     then
-      echo "PG 3.0 should be in backfill_toofull"
+      echo "One PG should be in backfill_toofull"
       ERRORS="$(expr $ERRORS + 1)"
     fi
 
-    if [ "$(ceph pg dump pgs | grep "^2.0" | grep active+clean | wc -l)" != "1" ];
+    if [ "$(get_num_in_state active+clean)" != "2" ];
     then
-      echo "PG 2.0 should have completed backfill"
+      echo "Two PGs should be active+clean after one PG completed backfill"
       ERRORS="$(expr $ERRORS + 1)"
     fi