ceph-helpers.sh: Add flush_pg_stats() to wait_for_clean() to make it reliable

osd-scrub-repair.sh: Fixes for omap keys landing on different OSDs due to flush

Signed-off-by: David Zafman <dzafman@redhat.com>

diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh
index 8940ae282bb93194715b1f0f84483558075d4ecb..119a18530f7529cc4d336126c1f6f37726dec895 100755 (executable)
--- a/qa/standalone/ceph-helpers.sh
+++ b/qa/standalone/ceph-helpers.sh
@@ -1397,6 +1397,7 @@ function wait_for_clean() {
     local -a delays=($(get_timeout_delays $TIMEOUT .1))
     local -i loop=0
 
+    flush_pg_stats
     while test $(get_num_pgs) == 0 ; do
        sleep 1
     done

diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh
index 0ab7723da9546419c45e3b1ff9ab9f9fd6bcb882..148a6078314b26e898c0f250fcfdcfa7a910bf4d 100755 (executable)
--- a/qa/standalone/scrub/osd-scrub-repair.sh
+++ b/qa/standalone/scrub/osd-scrub-repair.sh
@@ -919,8 +919,8 @@ function TEST_corrupt_scrub_replicated() {
             },
             {
               "Base64": false,
-              "value": "val3-ROBJ8",
-              "name": "_key3-ROBJ8"
+              "value": "val2-ROBJ8",
+              "name": "_key2-ROBJ8"
             },
             {
               "Base64": true,
@@ -947,8 +947,8 @@ function TEST_corrupt_scrub_replicated() {
             },
             {
               "Base64": false,
-              "value": "val2-ROBJ8",
-              "name": "_key2-ROBJ8"
+              "value": "val3-ROBJ8",
+              "name": "_key3-ROBJ8"
             },
             {
               "Base64": true,
@@ -1570,8 +1570,8 @@ EOF
             },
             {
               "Base64": false,
-              "value": "val3-ROBJ8",
-              "name": "_key3-ROBJ8"
+              "value": "val2-ROBJ8",
+              "name": "_key2-ROBJ8"
             },
             {
               "Base64": true,
@@ -1600,8 +1600,8 @@ EOF
             },
             {
               "Base64": false,
-              "value": "val2-ROBJ8",
-              "name": "_key2-ROBJ8"
+              "value": "val3-ROBJ8",
+              "name": "_key3-ROBJ8"
             },
             {
               "Base64": true,
@@ -1877,8 +1877,8 @@ function corrupt_scrub_erasure() {
             },
             {
               "Base64": false,
-              "value": "val3-EOBJ4",
-              "name": "_key3-EOBJ4"
+              "value": "val2-EOBJ4",
+              "name": "_key2-EOBJ4"
             },
             {
               "Base64": true,
@@ -1950,8 +1950,8 @@ function corrupt_scrub_erasure() {
             },
             {
               "Base64": false,
-              "value": "val2-EOBJ4",
-              "name": "_key2-EOBJ4"
+              "value": "val3-EOBJ4",
+              "name": "_key3-EOBJ4"
             },
             {
               "Base64": true,
@@ -2164,8 +2164,8 @@ EOF
             },
             {
               "Base64": false,
-              "value": "val3-EOBJ4",
-              "name": "_key3-EOBJ4"
+              "value": "val2-EOBJ4",
+              "name": "_key2-EOBJ4"
             },
             {
               "Base64": true,
@@ -2236,8 +2236,8 @@ EOF
             },
             {
               "Base64": false,
-              "value": "val2-EOBJ4",
-              "name": "_key2-EOBJ4"
+              "value": "val3-EOBJ4",
+              "name": "_key3-EOBJ4"
             },
             {
               "Base64": true,
@@ -2482,8 +2482,8 @@ EOF
             },
             {
               "Base64": false,
-              "value": "val3-EOBJ4",
-              "name": "_key3-EOBJ4"
+              "value": "val2-EOBJ4",
+              "name": "_key2-EOBJ4"
             },
             {
               "Base64": true,
@@ -2561,8 +2561,8 @@ EOF
             },
             {
               "Base64": false,
-              "value": "val2-EOBJ4",
-              "name": "_key2-EOBJ4"
+              "value": "val3-EOBJ4",
+              "name": "_key3-EOBJ4"
             },
             {
               "Base64": true,