From: Samuel Just <sam.just@inktank.com>
Date: Thu, 24 Oct 2013 21:31:27 +0000 (-0700)
Subject: PGMap::dirty_all should be asserting about osd_epochs, not in.osd_epochs
X-Git-Tag: v0.72-rc1~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=87d3f88742434a787c37f5a2a3e4fdb79e21d8a4;p=ceph.git

PGMap::dirty_all should be asserting about osd_epochs, not in.osd_epochs

Fixes: #6627
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
---

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 39cb30f97c86..ab4c885df4c0 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -532,7 +532,7 @@ void PGMap::dirty_all(Incremental& inc)
     inc.pg_stat_updates[p->first] = p->second;
   }
   for (hash_map<int32_t, osd_stat_t>::const_iterator p = osd_stat.begin(); p != osd_stat.end(); ++p) {
-    assert(inc.get_osd_epochs().count(p->first));
+    assert(osd_epochs.count(p->first));
     inc.update_stat(p->first,
 		   inc.get_osd_epochs().find(p->first)->second,
 		   p->second);