From 314ad07d5774e788e3b76be673aeec17651a8c29 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 27 Apr 2017 16:39:59 +0800 Subject: [PATCH] mon/OSDMonitor: skip prime_pg_temp if mapping is prior to osdmap Signed-off-by: Kefu Chai --- src/mon/OSDMonitor.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index e740677f4ad..b7b77d52d82 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -1118,7 +1118,7 @@ void OSDMonitor::encode_pending(MonitorDBStore::TransactionRef t) << mapping_job.get() << " did not complete, " << mapping_job->shards << " left" << dendl; mapping_job->abort(); - } else if (mapping.get_epoch() == osdmap.get_epoch()) { + } else if (mapping.get_epoch() < osdmap.get_epoch()) { dout(1) << __func__ << " skipping prime_pg_temp; mapping job " << mapping_job.get() << " is prior epoch " << mapping.get_epoch() << dendl;