From c048f6affb7ec55d4fd5b292f2a8b5955d1a390e Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 27 Feb 2017 18:57:26 -0600 Subject: [PATCH] test/osd/osd-scrub-snaps.sh: fix test - objects come in a different order, meh - ss is on head, always, not snapdir. - error messages on head, not snapdir Signed-off-by: Sage Weil --- src/osd/PrimaryLogPG.cc | 3 +- src/test/osd/osd-scrub-snaps.sh | 61 +++++++++++++++++---------------- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index c77f2c7af02b..ccbc8ba63e03 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -13322,7 +13322,8 @@ void PrimaryLogPG::scrub_snapshot_metadata( dout(10) << " will move snapset to head from " << soid << dendl; snapset_to_repair[soid.get_head()] = *snapset; } else if (snapset->is_legacy()) { - dout(10) << " will convert legacy snapset on " << soid << dendl; + dout(10) << " will convert legacy snapset on " << soid << " " << *snapset + << dendl; snapset_to_repair[soid.get_head()] = *snapset; } } else { diff --git a/src/test/osd/osd-scrub-snaps.sh b/src/test/osd/osd-scrub-snaps.sh index 5410e820c4ab..1cd9b562e4c7 100755 --- a/src/test/osd/osd-scrub-snaps.sh +++ b/src/test/osd/osd-scrub-snaps.sh @@ -308,6 +308,20 @@ function TEST_scrub_snaps() { "nspace": "", "name": "obj15" }, + { + "extra clones": [ + 7, + 4 + ], + "errors": [ + "ss_attr_missing", + "extra_clones" + ], + "snap": "head", + "locator": "", + "nspace": "", + "name": "obj2" + }, { "errors": [ "size_mismatch" @@ -317,6 +331,18 @@ function TEST_scrub_snaps() { "nspace": "", "name": "obj3" }, + { + "missing": [ + 7 + ], + "errors": [ + "clone_missing" + ], + "snap": "head", + "locator": "", + "nspace": "", + "name": "obj4" + }, { "missing": [ 2, @@ -367,32 +393,6 @@ function TEST_scrub_snaps() { "locator": "", "nspace": "", "name": "obj8" - }, - { - "extra clones": [ - 7, - 4 - ], - "errors": [ - "ss_attr_missing", - "extra_clones" - ], - "snap": "snapdir", - "locator": "", - "nspace": "", - "name": "obj2" - }, - { - "missing": [ - 7 - ], - "errors": [ - "clone_missing" - ], - "snap": "snapdir", - "locator": "", - "nspace": "", - "name": "obj4" } ], "epoch": 20 @@ -439,17 +439,18 @@ EOF err_strings[10]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj7:1 is an unexpected clone" err_strings[11]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj3:head on disk size [(]3840[)] does not match object info size [(]768[)] adjusted for ondisk to [(]768[)]" err_strings[12]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj6:1 is an unexpected clone" - err_strings[13]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj2:snapdir no 'snapset' attr" + err_strings[13]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj2:head no 'snapset' attr" err_strings[14]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj2:7 clone ignored due to missing snapset" err_strings[15]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj2:4 clone ignored due to missing snapset" - err_strings[16]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj4:snapdir expected clone .*:::obj4:7" - err_strings[17]="log_channel[(]cluster[)] log [[]INF[]] : scrub [0-9]*[.]0 .*:::obj4:snapdir 1 missing clone[(]s[)]" + err_strings[16]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj4:head expected clone .*:::obj4:7" + err_strings[17]="log_channel[(]cluster[)] log [[]INF[]] : scrub [0-9]*[.]0 .*:::obj4:head 1 missing clone[(]s[)]" err_strings[18]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj1:1 is an unexpected clone" err_strings[19]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj9:1 is missing in clone_size" err_strings[20]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj11:1 is an unexpected clone" err_strings[21]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj14:1 size 1032 != clone_size 1033" - err_strings[22]="log_channel[(]cluster[)] log [[]ERR[]] : [0-9]*[.]0 scrub 22 errors" + err_strings[22]="log_channel[(]cluster[)] log [[]ERR[]] : [0-9]*[.]0 scrub 23 errors" err_strings[23]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj15:head can't decode 'snapset' attr buffer" + err_strings[24]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 .*:::obj12:1 has no oi or legacy_snaps; cannot convert 1=[[]1[]]:[[]1[]].stray_clone_snaps=[{]1=[[]1[]][}]" for i in `seq 0 ${#err_strings[@]}` do -- 2.47.3