]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/OSDMonitor: skip prime_pg_temp if mapping is prior to osdmap 14826/head
authorKefu Chai <kchai@redhat.com>
Thu, 27 Apr 2017 08:39:59 +0000 (16:39 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 27 Apr 2017 08:40:25 +0000 (16:40 +0800)
Signed-off-by: Kefu Chai <kchai@redhat.com>
src/mon/OSDMonitor.cc

index e740677f4add4d747e095e3b0983a096fc4de989..b7b77d52d82abe0a4e0b7e48fdcb2b1126415d86 100644 (file)
@@ -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;