From 3df6438cd2c9a77a06b7a8d011bafbed00f1fc5e Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Sat, 8 Aug 2015 07:36:20 -0400
Subject: [PATCH] mon/PGMap: dump osd_epochs in deterministic order

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/mon/PGMap.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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);
-- 
2.47.3