From 1536cb0208cc983495fad61f1d748e81ab9e3767 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 19 Nov 2015 20:44:04 +0800 Subject: [PATCH] osd: note down the number of missing clones Caused by 2e0bb0ae9498fd9a0c49f1b81bf0c86f7a7cac42 Signed-off-by: Kefu Chai --- src/osd/ReplicatedPG.cc | 4 ++-- src/test/osd/osd-scrub-snaps.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 67a0657613bcb..5d63a99e1941b 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -12190,7 +12190,7 @@ void ReplicatedPG::_scrub( boost::optional head; boost::optional snapset; // If initialized so will head (above) vector::reverse_iterator curclone; // Defined only if snapset initialized - bool missing = false; + unsigned missing = 0; bufferlist last_data; @@ -12320,7 +12320,7 @@ void ReplicatedPG::_scrub( // Set this as a new head object head = soid; - missing = false; + missing = 0; dout(20) << __func__ << " " << mode << " new head " << head << dendl; diff --git a/src/test/osd/osd-scrub-snaps.sh b/src/test/osd/osd-scrub-snaps.sh index 0d591ddade635..9819c043834d1 100755 --- a/src/test/osd/osd-scrub-snaps.sh +++ b/src/test/osd/osd-scrub-snaps.sh @@ -181,7 +181,7 @@ function TEST_scrub_snaps() { err_strings[3]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 [0-9]*/666934a3/obj5/4 on disk size [(]4608[)] does not match object info size [(]512[)] adjusted for ondisk to [(]512[)]" err_strings[4]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 [0-9]*/666934a3/obj5/head expected clone [0-9]*/666934a3/obj5/2" err_strings[5]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 [0-9]*/666934a3/obj5/head expected clone [0-9]*/666934a3/obj5/1" - err_strings[6]="log_channel[(]cluster[)] log [[]INF[]] : scrub [0-9]*[.]0 [0-9]*/666934a3/obj5/head 1 missing clone[(]s[)]" + err_strings[6]="log_channel[(]cluster[)] log [[]INF[]] : scrub [0-9]*[.]0 [0-9]*/666934a3/obj5/head 2 missing clone[(]s[)]" err_strings[7]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 [0-9]*/d3a9faf5/obj12/head snapset.head_exists=false, but head exists" err_strings[8]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 [0-9]*/8df7eaa5/obj8/head snaps.seq not set" err_strings[9]="log_channel[(]cluster[)] log [[]ERR[]] : scrub [0-9]*[.]0 [0-9]*/5c889059/obj7/head snapset.head_exists=false, but head exists" -- 2.39.5