]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
OSD:shall reset primary and up_primary fields when beginning a new past_interval. 6240/head
authorxiexingguo <258156334@qq.com>
Tue, 13 Oct 2015 06:04:20 +0000 (14:04 +0800)
committerxiexingguo <258156334@qq.com>
Tue, 13 Oct 2015 06:04:20 +0000 (14:04 +0800)
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
src/osd/OSD.cc

index a577fd802c82a1f6749a46c02d6c5b45e165c6a1..ce158a7b6c3e344bbee3b4c2de425bc4078bb74b 100644 (file)
@@ -3062,6 +3062,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;
       }
     }