From c8bb8a2abb8973013a39c38dee7b0ca2d96c6a3a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 13 Aug 2015 14:37:16 -0400 Subject: [PATCH] Revert "mon/PGMap: dump osd_epochs in deterministic order" This reverts commit 3df6438cd2c9a77a06b7a8d011bafbed00f1fc5e. --- src/mon/PGMap.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc index 0b4c8ddcf8852..6ba0faecdbd94 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 tmp; - tmp.insert(osd_epochs.begin(), osd_epochs.end()); - for (map::iterator p = tmp.begin(); p != tmp.end(); ++p) { + for (ceph::unordered_map::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); -- 2.47.3