From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Fri, 6 May 2016 09:00:12 +0000 (+0800)
Subject: osd: make sure we get the full osdmap before applying inc osdmap
X-Git-Tag: v11.0.0~541^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=06b270d6673e760e809710d8aeb510cf873dfc36;p=ceph.git

osd: make sure we get the full osdmap before applying inc osdmap

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 7caef4ef946e..f6cc3a1c93ec 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6642,7 +6642,8 @@ void OSD::handle_osd_map(MOSDMap *m)
       OSDMap *o = new OSDMap;
       if (e > 1) {
 	bufferlist obl;
-	get_map_bl(e - 1, obl);
+        bool got = get_map_bl(e - 1, obl);
+        assert(got);
 	o->decode(obl);
       }