]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mds: preserve ESlaveUpdate::OP_PREPARE logevent before doing commit 35253/head
authorsongxinying <songxinying@sensetime.com>
Sun, 12 Apr 2020 14:01:00 +0000 (22:01 +0800)
committerNathan Cutler <ncutler@suse.com>
Tue, 26 May 2020 19:56:20 +0000 (21:56 +0200)
commit71bebf44b977c6831d88f5b4c2ee92b250c06243
tree5d2a7904d459d8ffd69954a00c4d16278a66878d
parent9e890709ef53ce29006c6fc754dd80e25df186d0
mds: preserve ESlaveUpdate::OP_PREPARE logevent before doing commit

Fixes: https://tracker.ceph.com/issues/45024
Signed-off-by: songxinying <songxinying@sensetime.com>
(cherry picked from commit 4940ab62e0d19ce36e53bcc67b2a2161c47f6c6d)

Conflicts:
src/mds/Mutation.h
- where master has "ceph::buffer::list", octopus has "bufferlist"
src/mds/LogSegment.h
src/mds/MDCache.cc
src/mds/MDCache.h
src/mds/Mutation.h
src/mds/Server.cc
src/mds/journal.cc