Merge PR ceph#24287 into master

* refs/pull/24287/head: osd/OSD: drop osd_lock only if pg osdmaps are truly laggy Reviewed-by: Sage Weil <[email protected]>
LeoHubery · Oct 11, 2018 · 28cca7b · 28cca7b
2 parents 65ea56d + d80993d
commit 28cca7b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
@@ -7449,7 +7449,6 @@ void OSD::handle_osd_map(MOSDMap *m)
       epoch_t need = osdmap->get_epoch() - max_lag;
       dout(10) << __func__ << " waiting for pgs to catch up (need " << need
 	       << " max_lag " << max_lag << ")" << dendl;
-      osd_lock.Unlock();
       for (auto shard : shards) {
 	epoch_t min = shard->get_min_pg_epoch();
 	if (need > min) {
@@ -7458,10 +7457,11 @@ void OSD::handle_osd_map(MOSDMap *m)
 		   << ", map cache is " << cct->_conf->osd_map_cache_size
 		   << ", max_lag_factor " << m_osd_pg_epoch_max_lag_factor
 		   << ")" << dendl;
+          osd_lock.Unlock();
 	  shard->wait_min_pg_epoch(need);
+          osd_lock.Lock();
 	}
       }
-      osd_lock.Lock();
     }
   }