From: Sage Weil <sage@redhat.com>
Date: Thu, 8 Jun 2017 02:49:23 +0000 (-0400)
Subject: mon/PGMap: erase osd_epochs entry too when we erase osd_stat entry
X-Git-Tag: v12.1.0~200^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F15573%2Fhead;p=ceph.git

mon/PGMap: erase osd_epochs entry too when we erase osd_stat entry

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

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index a623e20b2ea..b39b6a3d186 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -1130,6 +1130,7 @@ void PGMap::apply_incremental(CephContext *cct, const Incremental& inc)
     if (t != osd_stat.end()) {
       stat_osd_sub(t->first, t->second);
       osd_stat.erase(t);
+      osd_epochs.erase(*p);
     }
 
     // remove these old osds from full/nearfull set(s), too