qa/standalone/scrub: fix expected output in snaps repair tests

ronen-fr · ronen-fr · commit d0b8e14c63b0 · 2025-04-29T06:31:19.000-05:00
Specifically - TEST_corrupt_snapset_scrub_rep in osd-scrub-repair.sh. Signed-off-by: Ronen Friedman <rfriedma@redhat.com> (cherry picked from commit 4816832)
diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh
@@ -6159,7 +6159,7 @@ function TEST_corrupt_snapset_scrub_rep() {
 
     jq "$jqfilter" << EOF | jq '.inconsistents' | python3 -c "$sortkeys" > $dir/checkcsjson
 {
-  "epoch": 34,
+  "epoch": 39,
   "inconsistents": [
     {
       "object": {
@@ -6183,13 +6183,13 @@ function TEST_corrupt_snapset_scrub_rep() {
           "pool": 3,
           "namespace": ""
         },
-        "version": "24'8",
-        "prior_version": "21'3",
-        "last_reqid": "client.4195.0:1",
+        "version": "29'8",
+        "prior_version": "26'3",
+        "last_reqid": "client.4216.0:1",
         "user_version": 8,
         "size": 21,
-        "mtime": "2018-04-05 14:35:43.286117",
-        "local_mtime": "2018-04-05 14:35:43.288990",
+        "mtime": "2025-04-28T22:25:38.106944-0500",
+        "local_mtime": "2025-04-28T22:25:38.111607-0500",
         "lost": 0,
         "flags": [
           "dirty",
@@ -6206,7 +6206,8 @@ function TEST_corrupt_snapset_scrub_rep() {
         "manifest": {
           "type": 0
         },
-        "watchers": {}
+        "watchers": {},
+        "shard_versions": []
       },
       "shards": [
         {
@@ -6215,17 +6216,17 @@ function TEST_corrupt_snapset_scrub_rep() {
           "errors": [],
           "size": 21,
           "snapset": {
+            "seq": 1,
             "clones": [
               {
-                "overlap": "[]",
-                "size": 7,
                 "snap": 1,
+                "size": 7,
+                "overlap": "[]",
                 "snaps": [
                   1
                 ]
               }
-            ],
-            "seq": 1
+            ]
           }
         },
         {
@@ -6234,8 +6235,8 @@ function TEST_corrupt_snapset_scrub_rep() {
           "errors": [],
           "size": 21,
           "snapset": {
-            "clones": [],
-            "seq": 0
+            "seq": 0,
+            "clones": []
           }
         }
       ]
@@ -6262,13 +6263,13 @@ function TEST_corrupt_snapset_scrub_rep() {
           "pool": 3,
           "namespace": ""
         },
-        "version": "28'10",
-        "prior_version": "23'6",
-        "last_reqid": "client.4223.0:1",
+        "version": "35'10",
+        "prior_version": "28'6",
+        "last_reqid": "client.4246.0:1",
         "user_version": 10,
         "size": 21,
-        "mtime": "2018-04-05 14:35:48.326856",
-        "local_mtime": "2018-04-05 14:35:48.328097",
+        "mtime": "2025-04-28T22:25:44.826346-0500",
+        "local_mtime": "2025-04-28T22:25:44.828220-0500",
         "lost": 0,
         "flags": [
           "dirty",
@@ -6285,7 +6286,8 @@ function TEST_corrupt_snapset_scrub_rep() {
         "manifest": {
           "type": 0
         },
-        "watchers": {}
+        "watchers": {},
+        "shard_versions": []
       },
       "shards": [
         {
@@ -6294,8 +6296,8 @@ function TEST_corrupt_snapset_scrub_rep() {
           "errors": [],
           "size": 21,
           "snapset": {
-            "clones": [],
-            "seq": 0
+            "seq": 0,
+            "clones": []
           }
         },
         {
@@ -6304,23 +6306,24 @@ function TEST_corrupt_snapset_scrub_rep() {
           "errors": [],
           "size": 21,
           "snapset": {
+            "seq": 1,
             "clones": [
               {
-                "overlap": "[]",
-                "size": 7,
                 "snap": 1,
+                "size": 7,
+                "overlap": "[]",
                 "snaps": [
                   1
                 ]
               }
-            ],
-            "seq": 1
+            ]
           }
         }
       ]
     }
   ]
 }
+
 EOF
 
     jq "$jqfilter" $dir/json | jq '.inconsistents' | python3 -c "$sortkeys" > $dir/csjson

Original file line number	Diff line number	Diff line change
`@@ -6159,7 +6159,7 @@ function TEST_corrupt_snapset_scrub_rep() {`
`6159`	`6159`
`6160`	`6160`	`jq "$jqfilter" << EOF \| jq '.inconsistents' \| python3 -c "$sortkeys" > $dir/checkcsjson`
`6161`	`6161`	`{`
`6162`		`- "epoch": 34,`
	`6162`	`+ "epoch": 39,`
`6163`	`6163`	`"inconsistents": [`
`6164`	`6164`	`{`
`6165`	`6165`	`"object": {`
`@@ -6183,13 +6183,13 @@ function TEST_corrupt_snapset_scrub_rep() {`
`6183`	`6183`	`"pool": 3,`
`6184`	`6184`	`"namespace": ""`
`6185`	`6185`	`},`
`6186`		`- "version": "24'8",`
`6187`		`- "prior_version": "21'3",`
`6188`		`- "last_reqid": "client.4195.0:1",`
	`6186`	`+ "version": "29'8",`
	`6187`	`+ "prior_version": "26'3",`
	`6188`	`+ "last_reqid": "client.4216.0:1",`
`6189`	`6189`	`"user_version": 8,`
`6190`	`6190`	`"size": 21,`
`6191`		`- "mtime": "2018-04-05 14:35:43.286117",`
`6192`		`- "local_mtime": "2018-04-05 14:35:43.288990",`
	`6191`	`+ "mtime": "2025-04-28T22:25:38.106944-0500",`
	`6192`	`+ "local_mtime": "2025-04-28T22:25:38.111607-0500",`
`6193`	`6193`	`"lost": 0,`
`6194`	`6194`	`"flags": [`
`6195`	`6195`	`"dirty",`
`@@ -6206,7 +6206,8 @@ function TEST_corrupt_snapset_scrub_rep() {`
`6206`	`6206`	`"manifest": {`
`6207`	`6207`	`"type": 0`
`6208`	`6208`	`},`
`6209`		`- "watchers": {}`
	`6209`	`+ "watchers": {},`
	`6210`	`+ "shard_versions": []`
`6210`	`6211`	`},`
`6211`	`6212`	`"shards": [`
`6212`	`6213`	`{`
`@@ -6215,17 +6216,17 @@ function TEST_corrupt_snapset_scrub_rep() {`
`6215`	`6216`	`"errors": [],`
`6216`	`6217`	`"size": 21,`
`6217`	`6218`	`"snapset": {`
	`6219`	`+ "seq": 1,`
`6218`	`6220`	`"clones": [`
`6219`	`6221`	`{`
`6220`		`- "overlap": "[]",`
`6221`		`- "size": 7,`
`6222`	`6222`	`"snap": 1,`
	`6223`	`+ "size": 7,`
	`6224`	`+ "overlap": "[]",`
`6223`	`6225`	`"snaps": [`
`6224`	`6226`	`1`
`6225`	`6227`	`]`
`6226`	`6228`	`}`
`6227`		`- ],`
`6228`		`- "seq": 1`
	`6229`	`+ ]`
`6229`	`6230`	`}`
`6230`	`6231`	`},`
`6231`	`6232`	`{`
`@@ -6234,8 +6235,8 @@ function TEST_corrupt_snapset_scrub_rep() {`
`6234`	`6235`	`"errors": [],`
`6235`	`6236`	`"size": 21,`
`6236`	`6237`	`"snapset": {`
`6237`		`- "clones": [],`
`6238`		`- "seq": 0`
	`6238`	`+ "seq": 0,`
	`6239`	`+ "clones": []`
`6239`	`6240`	`}`
`6240`	`6241`	`}`
`6241`	`6242`	`]`
`@@ -6262,13 +6263,13 @@ function TEST_corrupt_snapset_scrub_rep() {`
`6262`	`6263`	`"pool": 3,`
`6263`	`6264`	`"namespace": ""`
`6264`	`6265`	`},`
`6265`		`- "version": "28'10",`
`6266`		`- "prior_version": "23'6",`
`6267`		`- "last_reqid": "client.4223.0:1",`
	`6266`	`+ "version": "35'10",`
	`6267`	`+ "prior_version": "28'6",`
	`6268`	`+ "last_reqid": "client.4246.0:1",`
`6268`	`6269`	`"user_version": 10,`
`6269`	`6270`	`"size": 21,`
`6270`		`- "mtime": "2018-04-05 14:35:48.326856",`
`6271`		`- "local_mtime": "2018-04-05 14:35:48.328097",`
	`6271`	`+ "mtime": "2025-04-28T22:25:44.826346-0500",`
	`6272`	`+ "local_mtime": "2025-04-28T22:25:44.828220-0500",`
`6272`	`6273`	`"lost": 0,`
`6273`	`6274`	`"flags": [`
`6274`	`6275`	`"dirty",`
`@@ -6285,7 +6286,8 @@ function TEST_corrupt_snapset_scrub_rep() {`
`6285`	`6286`	`"manifest": {`
`6286`	`6287`	`"type": 0`
`6287`	`6288`	`},`
`6288`		`- "watchers": {}`
	`6289`	`+ "watchers": {},`
	`6290`	`+ "shard_versions": []`
`6289`	`6291`	`},`
`6290`	`6292`	`"shards": [`
`6291`	`6293`	`{`
`@@ -6294,8 +6296,8 @@ function TEST_corrupt_snapset_scrub_rep() {`
`6294`	`6296`	`"errors": [],`
`6295`	`6297`	`"size": 21,`
`6296`	`6298`	`"snapset": {`
`6297`		`- "clones": [],`
`6298`		`- "seq": 0`
	`6299`	`+ "seq": 0,`
	`6300`	`+ "clones": []`
`6299`	`6301`	`}`
`6300`	`6302`	`},`
`6301`	`6303`	`{`
`@@ -6304,23 +6306,24 @@ function TEST_corrupt_snapset_scrub_rep() {`
`6304`	`6306`	`"errors": [],`
`6305`	`6307`	`"size": 21,`
`6306`	`6308`	`"snapset": {`
	`6309`	`+ "seq": 1,`
`6307`	`6310`	`"clones": [`
`6308`	`6311`	`{`
`6309`		`- "overlap": "[]",`
`6310`		`- "size": 7,`
`6311`	`6312`	`"snap": 1,`
	`6313`	`+ "size": 7,`
	`6314`	`+ "overlap": "[]",`
`6312`	`6315`	`"snaps": [`
`6313`	`6316`	`1`
`6314`	`6317`	`]`
`6315`	`6318`	`}`
`6316`		`- ],`
`6317`		`- "seq": 1`
	`6319`	`+ ]`
`6318`	`6320`	`}`
`6319`	`6321`	`}`
`6320`	`6322`	`]`
`6321`	`6323`	`}`
`6322`	`6324`	`]`
`6323`	`6325`	`}`
	`6326`	`+`
`6324`	`6327`	`EOF`
`6325`	`6328`
`6326`	`6329`	`jq "$jqfilter" $dir/json \| jq '.inconsistents' \| python3 -c "$sortkeys" > $dir/csjson`