From: xiexingguo <258156334@qq.com>
Date: Tue, 13 Oct 2015 06:04:20 +0000 (+0800)
Subject: OSD:shall reset primary and up_primary fields when beginning a new past_interval.
X-Git-Tag: v0.94.6~82^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6398%2Fhead;p=ceph.git

OSD:shall reset primary and up_primary fields when beginning a new past_interval.

Shall reset primary and up_primary fields when we start over a new past_interval in OSD::build_past_intervals_parallel().
Fixes: #13471
Signed-off-by: xie.xingguo@zte.com.cn
(cherry picked from commit 65064ca05bc7f8b6ef424806d1fd14b87add62a4)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 0c01ba6168df..33a59113d298 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3040,6 +3040,8 @@ void OSD::build_past_intervals_parallel()
 		 << " " << debug.str() << dendl;
 	p.old_up = up;
 	p.old_acting = acting;
+	p.primary = primary;
+	p.up_primary = up_primary;
 	p.same_interval_since = cur_epoch;
       }
     }