From: Sage Weil <sage@redhat.com>
Date: Thu, 13 Aug 2015 18:37:32 +0000 (-0400)
Subject: Revert "osd/HitSet: make subclasses dump deterministically"
X-Git-Tag: v9.1.0~372^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=23119ffacc0456da3cb23ee63f698a3241d0c3a9;p=ceph.git

Revert "osd/HitSet: make subclasses dump deterministically"

This reverts commit 34c048b3cb2b16658e692ac5110115612031510d.
---

diff --git a/src/osd/HitSet.h b/src/osd/HitSet.h
index 51a396a32611..2b981a3eaacf 100644
--- a/src/osd/HitSet.h
+++ b/src/osd/HitSet.h
@@ -237,10 +237,7 @@ public:
   void dump(Formatter *f) const {
     f->dump_unsigned("insert_count", count);
     f->open_array_section("hash_set");
-    // dump deterministically
-    std::set<uint32_t> tmp;
-    tmp.insert(hits.begin(), hits.end());
-    for (std::set<uint32_t>::iterator p = tmp.begin(); p != tmp.end(); ++p)
+    for (ceph::unordered_set<uint32_t>::const_iterator p = hits.begin(); p != hits.end(); ++p)
       f->dump_unsigned("hash", *p);
     f->close_section();
   }
@@ -317,10 +314,7 @@ public:
   void dump(Formatter *f) const {
     f->dump_unsigned("insert_count", count);
     f->open_array_section("set");
-    // dump deterministically
-    std::set<hobject_t> tmp;
-    tmp.insert(hits.begin(), hits.end());
-    for (std::set<hobject_t>::iterator p = tmp.begin(); p != tmp.end(); ++p) {
+    for (ceph::unordered_set<hobject_t>::const_iterator p = hits.begin(); p != hits.end(); ++p) {
       f->open_object_section("object");
       p->dump(f);
       f->close_section();