From: Yanhu Cao <jrcaoyanhu@jd.com>
Date: Wed, 15 Jul 2020 07:44:19 +0000 (+0800)
Subject: mds: fix mds forwarding request 'no_available_op_found'
X-Git-Tag: v16.1.0~1687^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F36107%2Fhead;p=ceph.git

mds: fix mds forwarding request 'no_available_op_found'

Fixes: https://tracker.ceph.com/issues/46543
Signed-off-by: Yanhu Cao <jrcaoyanhu@jd.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index caf7cf1c10e3..a8423edac188 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -9649,7 +9649,9 @@ void MDCache::request_finish(MDRequestRef& mdr)
 
 void MDCache::request_forward(MDRequestRef& mdr, mds_rank_t who, int port)
 {
-  mdr->mark_event("forwarding request");
+  CachedStackStringStream css;
+  *css << "forwarding request to mds." << who;
+  mdr->mark_event(css->strv());
   if (mdr->client_request && mdr->client_request->get_source().is_client()) {
     dout(7) << "request_forward " << *mdr << " to mds." << who << " req "
             << *mdr->client_request << dendl;
diff --git a/src/mds/Mutation.cc b/src/mds/Mutation.cc
index 16f1a7383ab6..10b211ecabe6 100644
--- a/src/mds/Mutation.cc
+++ b/src/mds/Mutation.cc
@@ -463,6 +463,7 @@ cref_t<MClientRequest> MDRequestImpl::release_client_request()
   msg_lock.lock();
   cref_t<MClientRequest> req;
   req.swap(client_request);
+  client_request = req;
   msg_lock.unlock();
   return req;
 }