]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
OSD:shall reset primary and up_primary fields when beginning a new past_interval. 6398/head
authorxiexingguo <258156334@qq.com>
Tue, 13 Oct 2015 06:04:20 +0000 (14:04 +0800)
committerNathan Cutler <ncutler@suse.com>
Tue, 27 Oct 2015 14:44:35 +0000 (15:44 +0100)
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)

src/osd/OSD.cc

index 0c01ba6168df6e0688ba78defc91bc6082919a2e..33a59113d2983090355bc1a2c1c55edc6e0b74f5 100644 (file)
@@ -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;
       }
     }