From: Loic Dachary <loic-201408@dachary.org>
Date: Thu, 30 Oct 2014 23:49:21 +0000 (+0100)
Subject: osd: past_interval display bug on acting
X-Git-Tag: v0.80.8~39^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2847%2Fhead;p=ceph.git

osd: past_interval display bug on acting

The acting array was incorrectly including the primary and up_primary.

http://tracker.ceph.com/issues/9752 Fixes: #9752

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
(cherry picked from commit c5f8d6eded52da451fdd1d807bd4700221e4c41c)
---

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 16bdbaf3417..eaa7a80ffdd 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -2179,9 +2179,9 @@ void pg_interval_t::dump(Formatter *f) const
   f->open_array_section("acting");
   for (vector<int>::const_iterator p = acting.begin(); p != acting.end(); ++p)
     f->dump_int("osd", *p);
+  f->close_section();
   f->dump_int("primary", primary);
   f->dump_int("up_primary", up_primary);
-  f->close_section();
 }
 
 void pg_interval_t::generate_test_instances(list<pg_interval_t*>& o)