]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: past_interval display bug on acting 2847/head
authorLoic Dachary <loic-201408@dachary.org>
Thu, 30 Oct 2014 23:49:21 +0000 (00:49 +0100)
committerLoic Dachary <loic-201408@dachary.org>
Fri, 31 Oct 2014 09:24:27 +0000 (10:24 +0100)
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)

src/osd/osd_types.cc

index 16bdbaf3417f080037e81f6147e6f972b4999cda..eaa7a80ffdde9877b2c5ca77971312ae2385fc8b 100644 (file)
@@ -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)