From ee1c029da4226420667ceeec2bacc82dcdae9a46 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Mon, 9 Jul 2012 17:57:03 -0700 Subject: [PATCH] ReplicatedPG: don't warn if backfill peer stats don't match pinfo.stats might be wrong if we did log-based recovery on the backfilled portion in addition to continuing backfill. bug #2750 Signed-off-by: Samuel Just --- src/osd/ReplicatedPG.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 2e2b5a43cbbf3..d3348de9c7cac 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -6319,14 +6319,10 @@ int ReplicatedPG::recover_backfill(int max) MOSDPGBackfill *m = NULL; if (bound.is_max()) { m = new MOSDPGBackfill(MOSDPGBackfill::OP_BACKFILL_FINISH, e, e, info.pgid); - if (info.stats.stats.sum.num_bytes != pinfo.stats.stats.sum.num_bytes) - osd->clog.error() << info.pgid << " backfill osd." << backfill_target << " stat mismatch on finish: " - << "num_bytes " << pinfo.stats.stats.sum.num_bytes - << " != expected " << info.stats.stats.sum.num_bytes << "\n"; - if (info.stats.stats.sum.num_objects != pinfo.stats.stats.sum.num_objects) - osd->clog.error() << info.pgid << " backfill osd." << backfill_target << " stat mismatch on finish: " - << "num_objects " << pinfo.stats.stats.sum.num_objects - << " != expected " << info.stats.stats.sum.num_objects << "\n"; + /* pinfo.stats might be wrong if we did log-based recovery on the + * backfilled portion in addition to continuing backfill. + */ + pinfo.stats = info.stats; start_recovery_op(hobject_t::get_max()); } else { m = new MOSDPGBackfill(MOSDPGBackfill::OP_BACKFILL_PROGRESS, e, e, info.pgid); -- 2.39.5