From: Sage Weil <sage@redhat.com>
Date: Thu, 13 Aug 2015 18:37:16 +0000 (-0400)
Subject: Revert "mon/PGMap: dump osd_epochs in deterministic order"
X-Git-Tag: v9.1.0~372^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c8bb8a2abb8973013a39c38dee7b0ca2d96c6a3a;p=ceph.git

Revert "mon/PGMap: dump osd_epochs in deterministic order"

This reverts commit 3df6438cd2c9a77a06b7a8d011bafbed00f1fc5e.
---

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 0b4c8ddcf885..6ba0faecdbd9 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -706,10 +706,8 @@ void PGMap::dump_basic(Formatter *f) const
   f->close_section();
 
   f->open_object_section("osd_epochs");
-  // 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) {
+  for (ceph::unordered_map<int32_t,epoch_t>::const_iterator p =
+	 osd_epochs.begin(); p != osd_epochs.end(); ++p) {
     f->open_object_section("osd");
     f->dump_unsigned("osd", p->first);
     f->dump_unsigned("epoch", p->second);