From f277690752688ffcb026852061cdd202c01440db Mon Sep 17 00:00:00 2001 From: Yanhu Cao Date: Wed, 15 Jul 2020 15:44:19 +0800 Subject: [PATCH] mds: fix mds forwarding request 'no_available_op_found' Fixes: https://tracker.ceph.com/issues/46543 Signed-off-by: Yanhu Cao (cherry picked from commit 4b7f76056d56bd3a1925d2b4c63cc664a1041435) --- src/mds/MDCache.cc | 4 +++- src/mds/Mutation.cc | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 88eece19f00bb..f19e6001da36d 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -9625,7 +9625,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 d9f3f7cadcc60..b5ea81543963f 100644 --- a/src/mds/Mutation.cc +++ b/src/mds/Mutation.cc @@ -444,6 +444,7 @@ cref_t MDRequestImpl::release_client_request() msg_lock.lock(); cref_t req; req.swap(client_request); + client_request = req; msg_lock.unlock(); return req; } -- 2.39.5