From: Sage Weil <sage@redhat.com>
Date: Thu, 17 May 2018 15:51:46 +0000 (-0500)
Subject: mon/PGMap: fix PGMapDigest decode
X-Git-Tag: v14.0.0~92^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42bdb066bb0397dbb84a2ca60ec4640cdd0afdef;p=ceph.git

mon/PGMap: fix PGMapDigest decode

The compat path wasn't clearing the map before filling in new entries.

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

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 6cc8f8644377..39090d571539 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -78,6 +78,7 @@ void PGMapDigest::decode(bufferlist::iterator& p)
   } else {
     map<int32_t, int32_t> nps;
     decode(nps, p);
+    num_pg_by_state.clear();
     for (auto i : nps) {
       num_pg_by_state[i.first] = i.second;
     }