]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6b3ac13) | patch
osd: merge replica log on primary need according to replica log's crt 30917/head
authorZengran Zhang <zhangzengran@sangfor.com.cn>
Mon, 12 Aug 2019 03:23:26 +0000 (11:23 +0800)
committerNathan Cutler <ncutler@suse.com>
Mon, 14 Oct 2019 21:17:36 +0000 (23:17 +0200)
commit51c20a25b2744ccc3003b4cc1897bf8539055647
tree6c213d9537b8553a5f9a790efc9646ef73ac762btree | snapshot
parent6b3ac130b9ebbc4ecda4bf5011908f56aa38f211commit | diff
osd: merge replica log on primary need according to replica log's crt

Fixes: https://tracker.ceph.com/issues/41194
Signed-off-by: Zengran Zhang <zhangzengran@sangfor.com.cn>
(cherry picked from commit ac387844e12edc9a1f481bdd1ba307ac4dc60e82)

Conflicts:
src/osd/PGLog.h
- ceph_assert
src/osd/PGLog.cc diff | blob | history
src/osd/PGLog.h diff | blob | history
src/test/osd/TestPGLog.cc diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.