From: Sage Weil <sage@redhat.com>
Date: Wed, 21 Feb 2018 03:14:27 +0000 (-0600)
Subject: osd: (pre)publish map before distributing to shards (and pgs)
X-Git-Tag: v13.1.0~390^2~47
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b4af83d7353a659e76f84352a80c9e953a135937;p=ceph.git

osd: (pre)publish map before distributing to shards (and pgs)

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 6b95be762f46..6edf496a6cf7 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -7759,6 +7759,10 @@ void OSD::consume_map()
     ceph_abort();
   }
 
+  service.pre_publish_map(osdmap);
+  service.await_reserved_maps();
+  service.publish_map(osdmap);
+
   int num_pg_primary = 0, num_pg_replica = 0, num_pg_stray = 0;
 
   unsigned pushes_to_free = 0;
@@ -7803,10 +7807,6 @@ void OSD::consume_map()
     }
   }
 
-  service.pre_publish_map(osdmap);
-  service.await_reserved_maps();
-  service.publish_map(osdmap);
-
   service.maybe_inject_dispatch_delay();
 
   dispatch_sessions_waiting_on_map();