1
0
mirror of https://github.com/ceph/ceph synced 2025-02-14 14:28:36 +00:00

Merge pull request from tchaikov/wip-prime-pg-temp

mon/OSDMonitor: skip prime_pg_temp if mapping is prior to osdmap

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
This commit is contained in:
Sage Weil 2017-04-28 11:27:22 -05:00 committed by GitHub
commit d0b2e606f7

View File

@ -1119,7 +1119,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;