From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 17 Dec 2019 00:07:55 +0000 (-0800)
Subject: Merge PR #29059 into master
X-Git-Tag: v15.1.0~470
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=05b8932e42e8dcdd9ce509f8a652a225b5729374;p=ceph.git

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>
---

05b8932e42e8dcdd9ce509f8a652a225b5729374
diff --cc src/mds/Server.cc
index f81f4288a499,33e95721fe81..60401669812e
--- a/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 3b49c47dda56,2e7a34e8a19e..a262ee125e26
--- a/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;