From: Sage Weil <sage@redhat.com>
Date: Sun, 5 Nov 2017 17:02:22 +0000 (-0600)
Subject: osd: change peering wq "drain" while not active
X-Git-Tag: v13.0.2~840^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3246f9020a69ef80a3e1345973a0faea9911a64a;p=ceph.git

osd: change peering wq "drain" while not active

Use the min epoch helpers instead of explicitly draining the work
queue to make sure that app PGs have processed the new maps.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index d3c73724799..8cc099cc7ec 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -7691,8 +7691,8 @@ void OSD::_committed_osd_maps(epoch_t first, epoch_t last, MOSDMap *m)
     maybe_update_heartbeat_peers();
 
   if (!is_active()) {
-    dout(10) << " not yet active; waiting for peering wq to drain" << dendl;
-    peering_wq.drain();
+    dout(10) << " not yet active; waiting for peering work to drain" << dendl;
+    service.wait_min_pg_epoch(last);
   } else {
     activate_map();
   }