Merge PR #29059 into master

* refs/pull/29059/head:
	mds: complete all the replay op when mds is restarted ,no matter the session is closed or not.

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

diff --cc src/common/options.cc
Simple merge

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

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

diff --cc src/mds/Server.cc
index f81f4288a4995ef665876ec2a93b862725617b5a,33e95721fe81cf0a861ae424987e071f846490b4..60401669812ec1a7158f0c5c971db7e941063012
--- 1/src/mds/Server.cc
--- 2/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@@ -233,8 -233,8 +233,9 @@@ Server::Server(MDSRank *m) 
    terminating_sessions(false),
    recall_throttle(g_conf().get_val<double>("mds_recall_max_decay_rate"))
  {
+   replay_unsafe_with_closed_session = g_conf().get_val<bool>("mds_replay_unsafe_with_closed_session");
    cap_revoke_eviction_timeout = g_conf().get_val<double>("mds_cap_revoke_eviction_timeout");
 +  max_snaps_per_dir = g_conf().get_val<uint64_t>("mds_max_snaps_per_dir");
    supported_features = feature_bitset_t(CEPHFS_FEATURES_MDS_SUPPORTED);
  }
  

diff --cc src/mds/Server.h
index 3b49c47dda560b4cd1ca7f0e00aaae8cc152e553,2e7a34e8a19e750534f6f7cb6282ec487810b44d..a262ee125e264a20c7673c22a954a2031fb671f0
--- 1/src/mds/Server.h
--- 2/src/mds/Server.h
+++ b/src/mds/Server.h
@@@ -105,8 -105,8 +105,9 @@@ private
    feature_bitset_t supported_features;
    feature_bitset_t required_client_features;
  
+   bool replay_unsafe_with_closed_session = false;
    double cap_revoke_eviction_timeout = 0;
 +  uint64_t max_snaps_per_dir = 100;
  
    friend class MDSContinuation;
    friend class ServerContext;