]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: modify osd-scrub-repair to match PR #43239 changes 43596/head
authorRonen Friedman <rfriedma@redhat.com>
Wed, 20 Oct 2021 06:42:51 +0000 (06:42 +0000)
committerRonen Friedman <rfriedma@redhat.com>
Wed, 20 Oct 2021 06:42:51 +0000 (06:42 +0000)
PR #43239 has modified ECBackend::get_hash_info() behavior.
Modified the standalone scrub test to match.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
qa/standalone/scrub/osd-scrub-repair.sh

index 625d976a7cf7ad1e85113a36aeed15e50780fe8d..e46bef07a6e6429d513a07c184df5f0ea38dd885 100755 (executable)
@@ -4673,8 +4673,6 @@ EOF
           "primary": false
         },
         {
-          "data_digest": "0x00000000",
-          "omap_digest": "0xffffffff",
           "object_info": {
             "oid": {
               "oid": "EOBJ5",
@@ -4711,6 +4709,7 @@ EOF
           },
           "size": 4096,
           "errors": [
+            "read_error",
             "size_mismatch_info",
             "obj_size_info_mismatch"
           ],
@@ -4763,6 +4762,7 @@ EOF
         "watchers": {}
       },
       "union_shard_errors": [
+        "read_error",
         "size_mismatch_info",
         "obj_size_info_mismatch"
       ],
@@ -5441,8 +5441,8 @@ EOF
           "size": 4096,
           "shard": 0,
           "errors": [
+            "read_error",
             "size_mismatch_info",
-            "ec_size_error",
             "obj_size_info_mismatch"
           ],
           "osd": 1,
@@ -5493,8 +5493,8 @@ EOF
         "watchers": {}
       },
       "union_shard_errors": [
+        "read_error",
         "size_mismatch_info",
-        "ec_size_error",
         "obj_size_info_mismatch"
       ],
       "errors": [