From 2470ab4abaab74693ab89f3374f4a231200c59b1 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Tue, 3 Oct 2017 21:06:05 +0800 Subject: [PATCH] qa/standalone/scrub/osd-scrub-repair.sh: add extents flag into object_info_t Introduced-by: https://github.com/ceph/ceph/pull/15199 Fixes: http://tracker.ceph.com/issues/21618 Signed-off-by: xie xingguo --- qa/standalone/scrub/osd-scrub-repair.sh | 74 ++++++++++++------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh index 3e1287c962d..d015a31cbba 100755 --- a/qa/standalone/scrub/osd-scrub-repair.sh +++ b/qa/standalone/scrub/osd-scrub-repair.sh @@ -649,7 +649,7 @@ function TEST_corrupt_scrub_replicated() { "primary": true } ], - "selected_object_info": "3:ce3f1d6a:::ROBJ1:head(47'54 osd.0.0:53 dirty|omap|data_digest|omap_digest s 7 uv 3 dd 2ddbf8f5 od f5fba2c6 alloc_hint [0 0 0])", + "selected_object_info": "3:ce3f1d6a:::ROBJ1:head(47'54 osd.0.0:53 dirty|omap|data_digest|omap_digest|extents s 7 uv 3 dd 2ddbf8f5 od f5fba2c6 alloc_hint [0 0 0])", "union_shard_errors": [ "size_mismatch_oi", "obj_size_oi_mismatch" @@ -681,7 +681,7 @@ function TEST_corrupt_scrub_replicated() { "primary": true } ], - "selected_object_info": "3:bc819597:::ROBJ12:head(47'52 osd.0.0:51 dirty|omap|data_digest|omap_digest s 7 uv 36 dd 2ddbf8f5 od 67f306a alloc_hint [0 0 0])", + "selected_object_info": "3:bc819597:::ROBJ12:head(47'52 osd.0.0:51 dirty|omap|data_digest|omap_digest|extents s 7 uv 36 dd 2ddbf8f5 od 67f306a alloc_hint [0 0 0])", "union_shard_errors": [ "stat_error" ], @@ -710,7 +710,7 @@ function TEST_corrupt_scrub_replicated() { "primary": true } ], - "selected_object_info": "3:d60617f9:::ROBJ13:head(47'55 osd.0.0:54 dirty|omap|data_digest|omap_digest s 7 uv 39 dd 2ddbf8f5 od 6441854d alloc_hint [0 0 0])", + "selected_object_info": "3:d60617f9:::ROBJ13:head(47'55 osd.0.0:54 dirty|omap|data_digest|omap_digest|extents s 7 uv 39 dd 2ddbf8f5 od 6441854d alloc_hint [0 0 0])", "union_shard_errors": [ "stat_error" ], @@ -810,7 +810,7 @@ function TEST_corrupt_scrub_replicated() { "primary": true } ], - "selected_object_info": "3:30259878:::ROBJ15:head(47'46 osd.0.0:45 dirty|omap|data_digest|omap_digest s 7 uv 45 dd 2ddbf8f5 od 2d2a4d6e alloc_hint [0 0 0])", + "selected_object_info": "3:30259878:::ROBJ15:head(47'46 osd.0.0:45 dirty|omap|data_digest|omap_digest|extents s 7 uv 45 dd 2ddbf8f5 od 2d2a4d6e alloc_hint [0 0 0])", "union_shard_errors": [ "oi_attr_missing" ], @@ -890,7 +890,7 @@ function TEST_corrupt_scrub_replicated() { "primary": true } ], - "selected_object_info": "3:f2a5b2a4:::ROBJ3:head(47'57 osd.0.0:56 dirty|omap|data_digest|omap_digest s 7 uv 9 dd 2ddbf8f5 od b35dfd alloc_hint [0 0 0])", + "selected_object_info": "3:f2a5b2a4:::ROBJ3:head(47'57 osd.0.0:56 dirty|omap|data_digest|omap_digest|extents s 7 uv 9 dd 2ddbf8f5 od b35dfd alloc_hint [0 0 0])", "union_shard_errors": [ "missing" ], @@ -962,7 +962,7 @@ function TEST_corrupt_scrub_replicated() { "primary": true } ], - "selected_object_info": "3:86586531:::ROBJ8:head(82'62 client.4351.0:1 dirty|omap|data_digest|omap_digest s 7 uv 66 dd 2ddbf8f5 od d6be81dc alloc_hint [0 0 0])", + "selected_object_info": "3:86586531:::ROBJ8:head(82'62 client.4351.0:1 dirty|omap|data_digest|omap_digest|extents s 7 uv 66 dd 2ddbf8f5 od d6be81dc alloc_hint [0 0 0])", "union_shard_errors": [], "errors": [ "attr_value_mismatch", @@ -979,14 +979,14 @@ function TEST_corrupt_scrub_replicated() { { "shards": [ { - "object_info": "3:ffdb2004:::ROBJ9:head(102'63 client.4433.0:1 dirty|omap|data_digest|omap_digest s 1 uv 67 dd 2b63260d od 2eecc539 alloc_hint [0 0 0])", + "object_info": "3:ffdb2004:::ROBJ9:head(102'63 client.4433.0:1 dirty|omap|data_digest|omap_digest|extents s 1 uv 67 dd 2b63260d od 2eecc539 alloc_hint [0 0 0])", "size": 1, "errors": [], "osd": 0, "primary": false }, { - "object_info": "3:ffdb2004:::ROBJ9:head(47'60 osd.0.0:59 dirty|omap|data_digest|omap_digest s 7 uv 27 dd 2ddbf8f5 od 2eecc539 alloc_hint [0 0 0])", + "object_info": "3:ffdb2004:::ROBJ9:head(47'60 osd.0.0:59 dirty|omap|data_digest|omap_digest|extents s 7 uv 27 dd 2ddbf8f5 od 2eecc539 alloc_hint [0 0 0])", "size": 1, "errors": [ "obj_size_oi_mismatch" @@ -995,7 +995,7 @@ function TEST_corrupt_scrub_replicated() { "primary": true } ], - "selected_object_info": "3:ffdb2004:::ROBJ9:head(102'63 client.4433.0:1 dirty|omap|data_digest|omap_digest s 1 uv 67 dd 2b63260d od 2eecc539 alloc_hint [0 0 0])", + "selected_object_info": "3:ffdb2004:::ROBJ9:head(102'63 client.4433.0:1 dirty|omap|data_digest|omap_digest|extents s 1 uv 67 dd 2b63260d od 2eecc539 alloc_hint [0 0 0])", "union_shard_errors": [ "obj_size_oi_mismatch" ], @@ -1084,7 +1084,7 @@ EOF "primary": true } ], - "selected_object_info": "3:ce3f1d6a:::ROBJ1:head(47'54 osd.0.0:53 dirty|omap|data_digest|omap_digest s 7 uv 3 dd 2ddbf8f5 od f5fba2c6 alloc_hint [0 0 0])", + "selected_object_info": "3:ce3f1d6a:::ROBJ1:head(47'54 osd.0.0:53 dirty|omap|data_digest|omap_digest|extents s 7 uv 3 dd 2ddbf8f5 od f5fba2c6 alloc_hint [0 0 0])", "union_shard_errors": [ "data_digest_mismatch_oi", "size_mismatch_oi", @@ -1125,7 +1125,7 @@ EOF "primary": true } ], - "selected_object_info": "3:b1f19cbd:::ROBJ10:head(47'51 osd.0.0:50 dirty|omap|data_digest|omap_digest s 7 uv 30 dd 2ddbf8f5 od c2025a24 alloc_hint [0 0 0])", + "selected_object_info": "3:b1f19cbd:::ROBJ10:head(47'51 osd.0.0:50 dirty|omap|data_digest|omap_digest|extents s 7 uv 30 dd 2ddbf8f5 od c2025a24 alloc_hint [0 0 0])", "union_shard_errors": [ "omap_digest_mismatch_oi" ], @@ -1157,7 +1157,7 @@ EOF "primary": true } ], - "selected_object_info": "3:87abbf36:::ROBJ11:head(47'48 osd.0.0:47 dirty|omap|data_digest|omap_digest s 7 uv 33 dd 2ddbf8f5 od a03cef03 alloc_hint [0 0 0])", + "selected_object_info": "3:87abbf36:::ROBJ11:head(47'48 osd.0.0:47 dirty|omap|data_digest|omap_digest|extents s 7 uv 33 dd 2ddbf8f5 od a03cef03 alloc_hint [0 0 0])", "union_shard_errors": [ "read_error" ], @@ -1188,7 +1188,7 @@ EOF "primary": true } ], - "selected_object_info": "3:bc819597:::ROBJ12:head(47'52 osd.0.0:51 dirty|omap|data_digest|omap_digest s 7 uv 36 dd 2ddbf8f5 od 67f306a alloc_hint [0 0 0])", + "selected_object_info": "3:bc819597:::ROBJ12:head(47'52 osd.0.0:51 dirty|omap|data_digest|omap_digest|extents s 7 uv 36 dd 2ddbf8f5 od 67f306a alloc_hint [0 0 0])", "union_shard_errors": [ "stat_error" ], @@ -1327,7 +1327,7 @@ EOF "primary": true } ], - "selected_object_info": "3:30259878:::ROBJ15:head(47'46 osd.0.0:45 dirty|omap|data_digest|omap_digest s 7 uv 45 dd 2ddbf8f5 od 2d2a4d6e alloc_hint [0 0 0])", + "selected_object_info": "3:30259878:::ROBJ15:head(47'46 osd.0.0:45 dirty|omap|data_digest|omap_digest|extents s 7 uv 45 dd 2ddbf8f5 od 2d2a4d6e alloc_hint [0 0 0])", "union_shard_errors": [ "oi_attr_missing" ], @@ -1416,7 +1416,7 @@ EOF "primary": true } ], - "selected_object_info": "3:e97ce31e:::ROBJ2:head(47'56 osd.0.0:55 dirty|omap|data_digest|omap_digest s 7 uv 6 dd 2ddbf8f5 od f8e11918 alloc_hint [0 0 0])", + "selected_object_info": "3:e97ce31e:::ROBJ2:head(47'56 osd.0.0:55 dirty|omap|data_digest|omap_digest|extents s 7 uv 6 dd 2ddbf8f5 od f8e11918 alloc_hint [0 0 0])", "union_shard_errors": [ "data_digest_mismatch_oi" ], @@ -1449,7 +1449,7 @@ EOF "primary": true } ], - "selected_object_info": "3:f2a5b2a4:::ROBJ3:head(47'57 osd.0.0:56 dirty|omap|data_digest|omap_digest s 7 uv 9 dd 2ddbf8f5 od b35dfd alloc_hint [0 0 0])", + "selected_object_info": "3:f2a5b2a4:::ROBJ3:head(47'57 osd.0.0:56 dirty|omap|data_digest|omap_digest|extents s 7 uv 9 dd 2ddbf8f5 od b35dfd alloc_hint [0 0 0])", "union_shard_errors": [ "missing" ], @@ -1483,7 +1483,7 @@ EOF "primary": true } ], - "selected_object_info": "3:f4981d31:::ROBJ4:head(47'58 osd.0.0:57 dirty|omap|data_digest|omap_digest s 7 uv 12 dd 2ddbf8f5 od e2d46ea4 alloc_hint [0 0 0])", + "selected_object_info": "3:f4981d31:::ROBJ4:head(47'58 osd.0.0:57 dirty|omap|data_digest|omap_digest|extents s 7 uv 12 dd 2ddbf8f5 od e2d46ea4 alloc_hint [0 0 0])", "union_shard_errors": [ "omap_digest_mismatch_oi" ], @@ -1519,7 +1519,7 @@ EOF "primary": true } ], - "selected_object_info": "3:f4bfd4d1:::ROBJ5:head(47'59 osd.0.0:58 dirty|omap|data_digest|omap_digest s 7 uv 15 dd 2ddbf8f5 od 1a862a41 alloc_hint [0 0 0])", + "selected_object_info": "3:f4bfd4d1:::ROBJ5:head(47'59 osd.0.0:58 dirty|omap|data_digest|omap_digest|extents s 7 uv 15 dd 2ddbf8f5 od 1a862a41 alloc_hint [0 0 0])", "union_shard_errors": [ "omap_digest_mismatch_oi" ], @@ -1555,7 +1555,7 @@ EOF "primary": true } ], - "selected_object_info": "3:a53c12e8:::ROBJ6:head(47'50 osd.0.0:49 dirty|omap|data_digest|omap_digest s 7 uv 18 dd 2ddbf8f5 od 179c919f alloc_hint [0 0 0])", + "selected_object_info": "3:a53c12e8:::ROBJ6:head(47'50 osd.0.0:49 dirty|omap|data_digest|omap_digest|extents s 7 uv 18 dd 2ddbf8f5 od 179c919f alloc_hint [0 0 0])", "union_shard_errors": [ "omap_digest_mismatch_oi" ], @@ -1591,7 +1591,7 @@ EOF "primary": true } ], - "selected_object_info": "3:8b55fa4b:::ROBJ7:head(47'49 osd.0.0:48 dirty|omap|data_digest|omap_digest s 7 uv 21 dd 2ddbf8f5 od efced57a alloc_hint [0 0 0])", + "selected_object_info": "3:8b55fa4b:::ROBJ7:head(47'49 osd.0.0:48 dirty|omap|data_digest|omap_digest|extents s 7 uv 21 dd 2ddbf8f5 od efced57a alloc_hint [0 0 0])", "union_shard_errors": [ "omap_digest_mismatch_oi" ], @@ -1669,7 +1669,7 @@ EOF "primary": true } ], - "selected_object_info": "3:86586531:::ROBJ8:head(82'62 client.4351.0:1 dirty|omap|data_digest|omap_digest s 7 uv 66 dd 2ddbf8f5 od d6be81dc alloc_hint [0 0 0])", + "selected_object_info": "3:86586531:::ROBJ8:head(82'62 client.4351.0:1 dirty|omap|data_digest|omap_digest|extents s 7 uv 66 dd 2ddbf8f5 od d6be81dc alloc_hint [0 0 0])", "union_shard_errors": [], "errors": [ "attr_value_mismatch", @@ -1686,7 +1686,7 @@ EOF { "shards": [ { - "object_info": "3:ffdb2004:::ROBJ9:head(47'60 osd.0.0:59 dirty|omap|data_digest|omap_digest s 7 uv 27 dd 2ddbf8f5 od 2eecc539 alloc_hint [0 0 0])", + "object_info": "3:ffdb2004:::ROBJ9:head(47'60 osd.0.0:59 dirty|omap|data_digest|omap_digest|extents s 7 uv 27 dd 2ddbf8f5 od 2eecc539 alloc_hint [0 0 0])", "data_digest": "0x1f26fb26", "omap_digest": "0x2eecc539", "size": 3, @@ -1697,7 +1697,7 @@ EOF "primary": false }, { - "object_info": "3:ffdb2004:::ROBJ9:head(122'64 client.4532.0:1 dirty|omap|data_digest|omap_digest s 3 uv 68 dd 1f26fb26 od 2eecc539 alloc_hint [0 0 0])", + "object_info": "3:ffdb2004:::ROBJ9:head(122'64 client.4532.0:1 dirty|omap|data_digest|omap_digest|extents s 3 uv 68 dd 1f26fb26 od 2eecc539 alloc_hint [0 0 0])", "data_digest": "0x1f26fb26", "omap_digest": "0x2eecc539", "size": 3, @@ -1706,7 +1706,7 @@ EOF "primary": true } ], - "selected_object_info": "3:ffdb2004:::ROBJ9:head(122'64 client.4532.0:1 dirty|omap|data_digest|omap_digest s 3 uv 68 dd 1f26fb26 od 2eecc539 alloc_hint [0 0 0])", + "selected_object_info": "3:ffdb2004:::ROBJ9:head(122'64 client.4532.0:1 dirty|omap|data_digest|omap_digest|extents s 3 uv 68 dd 1f26fb26 od 2eecc539 alloc_hint [0 0 0])", "union_shard_errors": [ "obj_size_oi_mismatch" ], @@ -1859,7 +1859,7 @@ function corrupt_scrub_erasure() { "primary": false } ], - "selected_object_info": "3:9175b684:::EOBJ1:head(21'1 client.4179.0:1 dirty|data_digest s 7 uv 1 dd 2ddbf8f5 alloc_hint [0 0 0])", + "selected_object_info": "3:9175b684:::EOBJ1:head(21'1 client.4179.0:1 dirty|data_digest|extents s 7 uv 1 dd 2ddbf8f5 alloc_hint [0 0 0])", "union_shard_errors": [ "size_mismatch_oi", "obj_size_oi_mismatch" @@ -1900,7 +1900,7 @@ function corrupt_scrub_erasure() { "primary": false } ], - "selected_object_info": "3:b197b25d:::EOBJ3:head(37'3 client.4251.0:1 dirty|data_digest s 7 uv 3 dd 2ddbf8f5 alloc_hint [0 0 0])", + "selected_object_info": "3:b197b25d:::EOBJ3:head(37'3 client.4251.0:1 dirty|data_digest|extents s 7 uv 3 dd 2ddbf8f5 alloc_hint [0 0 0])", "union_shard_errors": [ "missing" ], @@ -2018,7 +2018,7 @@ function corrupt_scrub_erasure() { ] } ], - "selected_object_info": "3:5e723e06:::EOBJ4:head(45'6 client.4289.0:1 dirty|data_digest s 7 uv 6 dd 2ddbf8f5 alloc_hint [0 0 0])", + "selected_object_info": "3:5e723e06:::EOBJ4:head(45'6 client.4289.0:1 dirty|data_digest|extents s 7 uv 6 dd 2ddbf8f5 alloc_hint [0 0 0])", "union_shard_errors": [], "errors": [ "attr_value_mismatch", @@ -2059,7 +2059,7 @@ function corrupt_scrub_erasure() { "primary": false } ], - "selected_object_info": "3:8549dfb5:::EOBJ5:head(65'7 client.4441.0:1 dirty|data_digest s 7 uv 7 dd 2ddbf8f5 alloc_hint [0 0 0])", + "selected_object_info": "3:8549dfb5:::EOBJ5:head(65'7 client.4441.0:1 dirty|data_digest|extents s 7 uv 7 dd 2ddbf8f5 alloc_hint [0 0 0])", "union_shard_errors": [ "size_mismatch_oi", "obj_size_oi_mismatch" @@ -2141,7 +2141,7 @@ EOF "primary": false } ], - "selected_object_info": "3:9175b684:::EOBJ1:head(27'1 client.4155.0:1 dirty|data_digest s 7 uv 1 dd 2ddbf8f5 alloc_hint [0 0 0])", + "selected_object_info": "3:9175b684:::EOBJ1:head(27'1 client.4155.0:1 dirty|data_digest|extents s 7 uv 1 dd 2ddbf8f5 alloc_hint [0 0 0])", "union_shard_errors": [ "read_error", "size_mismatch_oi", @@ -2187,7 +2187,7 @@ EOF "primary": false } ], - "selected_object_info": "3:b197b25d:::EOBJ3:head(41'3 client.4199.0:1 dirty|data_digest s 7 uv 3 dd 2ddbf8f5 alloc_hint [0 0 0])", + "selected_object_info": "3:b197b25d:::EOBJ3:head(41'3 client.4199.0:1 dirty|data_digest|extents s 7 uv 3 dd 2ddbf8f5 alloc_hint [0 0 0])", "union_shard_errors": [ "missing" ], @@ -2311,7 +2311,7 @@ EOF "primary": false } ], - "selected_object_info": "3:5e723e06:::EOBJ4:head(48'6 client.4223.0:1 dirty|data_digest s 7 uv 6 dd 2ddbf8f5 alloc_hint [0 0 0])", + "selected_object_info": "3:5e723e06:::EOBJ4:head(48'6 client.4223.0:1 dirty|data_digest|extents s 7 uv 6 dd 2ddbf8f5 alloc_hint [0 0 0])", "union_shard_errors": [], "errors": [ "attr_value_mismatch", @@ -2358,7 +2358,7 @@ EOF "primary": false } ], - "selected_object_info": "3:8549dfb5:::EOBJ5:head(65'7 client.4288.0:1 dirty|data_digest s 7 uv 7 dd 2ddbf8f5 alloc_hint [0 0 0])", + "selected_object_info": "3:8549dfb5:::EOBJ5:head(65'7 client.4288.0:1 dirty|data_digest|extents s 7 uv 7 dd 2ddbf8f5 alloc_hint [0 0 0])", "union_shard_errors": [ "size_mismatch_oi", "obj_size_oi_mismatch" @@ -2416,7 +2416,7 @@ EOF "primary": false } ], - "selected_object_info": "3:9175b684:::EOBJ1:head(21'1 client.4179.0:1 dirty|data_digest s 7 uv 1 dd 2ddbf8f5 alloc_hint [0 0 0])", + "selected_object_info": "3:9175b684:::EOBJ1:head(21'1 client.4179.0:1 dirty|data_digest|extents s 7 uv 1 dd 2ddbf8f5 alloc_hint [0 0 0])", "union_shard_errors": [ "read_error", "size_mismatch_oi", @@ -2463,7 +2463,7 @@ EOF "primary": false } ], - "selected_object_info": "3:9babd184:::EOBJ2:head(29'2 client.4217.0:1 dirty|data_digest s 7 uv 2 dd 2ddbf8f5 alloc_hint [0 0 0])", + "selected_object_info": "3:9babd184:::EOBJ2:head(29'2 client.4217.0:1 dirty|data_digest|extents s 7 uv 2 dd 2ddbf8f5 alloc_hint [0 0 0])", "union_shard_errors": [ "ec_hash_error" ], @@ -2505,7 +2505,7 @@ EOF "primary": false } ], - "selected_object_info": "3:b197b25d:::EOBJ3:head(37'3 client.4251.0:1 dirty|data_digest s 7 uv 3 dd 2ddbf8f5 alloc_hint [0 0 0])", + "selected_object_info": "3:b197b25d:::EOBJ3:head(37'3 client.4251.0:1 dirty|data_digest|extents s 7 uv 3 dd 2ddbf8f5 alloc_hint [0 0 0])", "union_shard_errors": [ "missing" ], @@ -2629,7 +2629,7 @@ EOF ] } ], - "selected_object_info": "3:5e723e06:::EOBJ4:head(45'6 client.4289.0:1 dirty|data_digest s 7 uv 6 dd 2ddbf8f5 alloc_hint [0 0 0])", + "selected_object_info": "3:5e723e06:::EOBJ4:head(45'6 client.4289.0:1 dirty|data_digest|extents s 7 uv 6 dd 2ddbf8f5 alloc_hint [0 0 0])", "union_shard_errors": [], "errors": [ "attr_value_mismatch", @@ -2675,7 +2675,7 @@ EOF "primary": false } ], - "selected_object_info": "3:8549dfb5:::EOBJ5:head(65'7 client.4441.0:1 dirty|data_digest s 7 uv 7 dd 2ddbf8f5 alloc_hint [0 0 0])", + "selected_object_info": "3:8549dfb5:::EOBJ5:head(65'7 client.4441.0:1 dirty|data_digest|extents s 7 uv 7 dd 2ddbf8f5 alloc_hint [0 0 0])", "union_shard_errors": [ "size_mismatch_oi", "ec_size_error", -- 2.39.5