From d1cc3ded789f312e0b276ab3b105c2663ab1b49a Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Mon, 16 Nov 2015 15:06:30 -0800 Subject: [PATCH] PG: only queue for recovery once peered Signed-off-by: Samuel Just --- src/osd/PG.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 03c4df954203..0059f5b8e172 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -6742,7 +6742,8 @@ boost::statechart::result PG::RecoveryState::Active::react(const ActMap&) pg->queue_snap_trim(); } - if (!pg->is_clean() && + if (pg->is_peered() && + !pg->is_clean() && !pg->get_osdmap()->test_flag(CEPH_OSDMAP_NOBACKFILL) && (!pg->get_osdmap()->test_flag(CEPH_OSDMAP_NOREBALANCE) || pg->is_degraded())) { pg->queue_recovery(); @@ -6810,7 +6811,8 @@ boost::statechart::result PG::RecoveryState::Active::react(const MLogRec& logevt pg->peer_missing[logevt.from], logevt.from, context< RecoveryMachine >().get_recovery_ctx()); - if (got_missing) + if (pg->is_peered() && + got_missing) pg->queue_recovery(); return discard_event(); } -- 2.47.3