From: Sage Weil <sage@redhat.com>
Date: Fri, 29 Apr 2016 19:24:09 +0000 (-0400)
Subject: osd/PG: update info.stats.* mappings on split
X-Git-Tag: v0.94.8~26^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F9001%2Fhead;p=ceph.git

osd/PG: update info.stats.* mappings on split

These are updated in the init and start_peering_interval paths, but not
on split.

Fixes: http://tracker.ceph.com/issues/15523
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 8b42294d98dd70715184991da5ba495fbe93d009)
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 7917638b1e72..dd3628c93139 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2214,6 +2214,12 @@ void PG::split_into(pg_t child_pgid, PG *child, unsigned split_bits)
   if (get_primary() != child->get_primary())
     child->info.history.same_primary_since = get_osdmap()->get_epoch();
 
+  child->info.stats.up = up;
+  child->info.stats.up_primary = up_primary;
+  child->info.stats.acting = acting;
+  child->info.stats.acting_primary = primary;
+  child->info.stats.mapping_epoch = get_osdmap()->get_epoch();
+
   // History
   child->past_intervals = past_intervals;