From: Yan, Zheng <zyan@redhat.com>
Date: Mon, 20 Nov 2017 00:29:12 +0000 (+0800)
Subject: mds: don't delay processing completed requests in replay queue
X-Git-Tag: v13.0.1~116^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F19018%2Fhead;p=ceph.git

mds: don't delay processing completed requests in replay queue

Completed requests can also be in replay queue, they need to be processed
(treated as lookup request) in clientreplay stage. MDS will be stuck at
clientreplay stage if it delays processing requests of this type.

the bug was introduced by commit 0afbc033
(mds: don't rdlock locks in replica object while auth mds is recovering)

Fixes: http://tracker.ceph.com/issues/22163
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
---

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 388f6a58bcf..3f628f96057 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -235,7 +235,7 @@ bool Locker::acquire_locks(MDRequestRef& mdr,
          lock->get_type() == CEPH_LOCK_IPOLICY) &&
 	mds->is_cluster_degraded() &&
 	mdr->is_master() &&
-	!mdr->is_replay()) {
+	!mdr->is_queued_for_replay()) {
       // waiting for recovering mds, to guarantee replayed requests and mksnap/setlayout
       // get processed in proper order.
       bool wait = false;
@@ -587,7 +587,7 @@ bool Locker::acquire_locks(MDRequestRef& mdr,
       assert(mdr->is_master());
       if ((*p)->needs_recover()) {
 	if (mds->is_cluster_degraded()) {
-	  if (!mdr->is_replay()) {
+	  if (!mdr->is_queued_for_replay()) {
 	    // see comments in SimpleLock::set_state_rejoin() and
 	    // ScatterLock::encode_state_for_rejoin()
 	    drop_locks(mdr.get());
diff --git a/src/mds/Mutation.cc b/src/mds/Mutation.cc
index 4e26b515896..52c0ca2339d 100644
--- a/src/mds/Mutation.cc
+++ b/src/mds/Mutation.cc
@@ -313,9 +313,9 @@ void MDRequestImpl::set_filepath2(const filepath& fp)
   more()->filepath2 = fp;
 }
 
-bool MDRequestImpl::is_replay() const
+bool MDRequestImpl::is_queued_for_replay() const
 {
-  return client_request ? client_request->is_replay() : false;
+  return client_request ? client_request->is_queued_for_replay() : false;
 }
 
 void MDRequestImpl::print(ostream &out) const
diff --git a/src/mds/Mutation.h b/src/mds/Mutation.h
index 4738f8a5c19..abf0078d78a 100644
--- a/src/mds/Mutation.h
+++ b/src/mds/Mutation.h
@@ -331,7 +331,7 @@ struct MDRequestImpl : public MutationImpl {
   const filepath& get_filepath2();
   void set_filepath(const filepath& fp);
   void set_filepath2(const filepath& fp);
-  bool is_replay() const;
+  bool is_queued_for_replay() const;
 
   void print(ostream &out) const override;
   void dump(Formatter *f) const override;