From: Sage Weil <sage@redhat.com>
Date: Sat, 8 Aug 2015 11:36:20 +0000 (-0400)
Subject: mon/PGMap: dump osd_epochs in deterministic order
X-Git-Tag: v9.1.0~408^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3df6438cd2c9a77a06b7a8d011bafbed00f1fc5e;p=ceph.git

mon/PGMap: dump osd_epochs in deterministic order

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

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index abce6a93ec57..205ebadaba70 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -706,8 +706,10 @@ void PGMap::dump_basic(Formatter *f) const
   f->close_section();
 
   f->open_object_section("osd_epochs");
-  for (ceph::unordered_map<int32_t,epoch_t>::const_iterator p =
-	 osd_epochs.begin(); p != osd_epochs.end(); ++p) {
+  // dump deterministically
+  map<int32_t,epoch_t> tmp;
+  tmp.insert(osd_epochs.begin(), osd_epochs.end());
+  for (map<int32_t,epoch_t>::iterator p = tmp.begin(); p != tmp.end(); ++p) {
     f->open_object_section("osd");
     f->dump_unsigned("osd", p->first);
     f->dump_unsigned("epoch", p->second);