Merge PR #34507 into master

* refs/pull/34507/head:
	mds: preserve ESlaveUpdate::OP_PREPARE logevent before doing commit

Reviewed-by: Zheng Yan <zyan@redhat.com>

diff --cc src/mds/MDCache.cc
Simple merge

diff --cc src/mds/MDCache.h
Simple merge

diff --cc src/mds/Server.cc
Simple merge

diff --cc src/mds/journal.cc
Simple merge