From de97f8b607894f654cd7bc4116329a890b4a6db7 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Wed, 31 May 2017 13:49:18 -0700 Subject: [PATCH] Revert "osd: When scrub finds an attr error mark shard inconsistent" This reverts commit 44736aac74493b5532c9e3574a37a3642766f212. Signed-off-by: David Zafman --- src/osd/PGBackend.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc index 57e4c001ef64f..fab9ee826642c 100644 --- a/src/osd/PGBackend.cc +++ b/src/osd/PGBackend.cc @@ -782,15 +782,16 @@ void PGBackend::be_compare_scrubmaps( object_error, ss); // Some errors might have already been set in be_select_auth_object() - if (found || shard_map[j->first].errors != 0) { + if (shard_map[j->first].errors != 0) { cur_inconsistent.insert(j->first); if (shard_map[j->first].has_deep_errors()) ++deep_errors; - else if (shard_map[j->first].has_shallow_errors()) + else ++shallow_errors; // Only true if be_compare_scrub_objects() found errors and put something // in ss. - errorstream << pgid << " shard " << j->first << ": soid " << *k + if (found) + errorstream << pgid << " shard " << j->first << ": soid " << *k << " " << ss.str() << "\n"; } else { // XXX: The auth shard might get here that we don't know -- 2.39.5