From: Sage Weil <sage@redhat.com>
Date: Fri, 13 Oct 2017 22:11:38 +0000 (-0500)
Subject: mon/OSDMonitor: reset OSDMap state before decode
X-Git-Tag: v13.0.2~844^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1f133a2350afedff9e10e725ff23684aaefb43b9;p=ceph.git

mon/OSDMonitor: reset OSDMap state before decode

This ensures we don't have any cruft left over in fields that decode()
assumes are initialized from the ctor (and not a previous instance).

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 6a6a29ec2356..fad0d3e4ec3b 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -343,6 +343,7 @@ void OSDMonitor::update_from_paxos(bool *need_bootstrap)
     get_version_full(latest_full, latest_bl);
     assert(latest_bl.length() != 0);
     dout(7) << __func__ << " loading latest full map e" << latest_full << dendl;
+    osdmap = OSDMap();
     osdmap.decode(latest_bl);
   }