From: w11979 <wang.wenfeng@h3c.com>
Date: Fri, 1 Sep 2017 14:02:34 +0000 (-0400)
Subject: osd: fix build_initial_pg_history
X-Git-Tag: v12.2.1~72^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e2e81403f8dd2329c0e99c8c8abbfa8351f0401e;p=ceph.git

osd: fix build_initial_pg_history

We need to update our info about the previous interval in order to
detect interval changes properly.

Fixes: http://tracker.ceph.com/issues/21203

Signed-off-by: w11979 <wang.wenfeng@h3c.com>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit afdacc6ed76dd288fdbc0f99857d9ffba23c5132)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 28608f1250a9..7795b857b9db 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4454,6 +4454,10 @@ void OSD::build_initial_pg_history(
       h->last_epoch_split = e;
     }
     lastmap = osdmap;
+    up_primary = new_up_primary;
+    acting_primary = new_acting_primary;
+    up = new_up;
+    acting = new_acting;
   }
   dout(20) << __func__ << " " << debug.str() << dendl;
   dout(10) << __func__ << " " << *h << " " << *pi