]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #33910 from xiexingguo/wip-44532-2
authorXie Xingguo <xie.xingguo@zte.com.cn>
Thu, 26 Mar 2020 00:10:22 +0000 (08:10 +0800)
committerGitHub <noreply@github.com>
Thu, 26 Mar 2020 00:10:22 +0000 (08:10 +0800)
osd/PeeringState: do not trim pg log past last_update_ondisk

Reviewed-by: Yan Jun <yan.jun8@zte.com.cn>
Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/osd/PeeringState.cc
src/osd/PeeringState.h
src/osd/PrimaryLogPG.h

Simple merge
Simple merge
Simple merge