]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mds: preserve ESlaveUpdate::OP_PREPARE logevent before doing commit 35394/head
authorsongxinying <songxinying@sensetime.com>
Sun, 12 Apr 2020 14:01:00 +0000 (22:01 +0800)
committerNathan Cutler <ncutler@suse.com>
Thu, 4 Jun 2020 14:32:01 +0000 (16:32 +0200)
commit4273de4cfaf36f2b5a241d4a1703efd8b438afa7
tree14f2f2250d940a37ba8fa90ce29daf3a406bbb4a
parent9ea9bcfb082697e0172084da01ceb5b49f305331
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/MDCache.cc
- use MMDSResolve::create() in nautilus, instead of make_message<MMDSResolve>()
    src/mds/MDCache.h
    src/mds/Mutation.h
- in nautilus, these two files are structured differently from master (large
  chunks of the master code are missing in nautilus, ordering of code is
  different also)
    src/mds/Server.cc
- use nautilus equivalent instead of "make_message<MMDSSlaveRequest>"
src/mds/LogSegment.h
src/mds/MDCache.cc
src/mds/MDCache.h
src/mds/Mutation.h
src/mds/Server.cc
src/mds/journal.cc