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 0b4c8ddcf88524e00324649678789021c8e223c5..6ba0faecdbd949f62aab29a2cfe9b63cf5dfef86 100644 (file)
--- 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);