From d755a4a78242293dd3103bdd0748292df3034563 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Wed, 14 Sep 2016 18:22:01 +0800 Subject: [PATCH] mds: remove fail-safe queueing replay request MDSRank::queue_one_replay() does not create active request immediately, it just queues corresponding C_MDS_RetryMessage for execution. So the fail-safe code can queue an extra replay request. This can cause replay requests be processed out-of-order Fixes: http://tracker.ceph.com/issues/17271 Signed-off-by: Yan, Zheng --- src/mds/MDCache.cc | 6 ------ src/mds/MDSRank.cc | 4 +--- src/mds/Server.cc | 1 + 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index c5b0ebae13cc..e9a261b47431 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -9073,12 +9073,6 @@ void MDCache::request_cleanup(MDRequestRef& mdr) // remove from map active_requests.erase(mdr->reqid); - // fail-safe! - if (was_replay && active_requests.empty()) { - dout(10) << " fail-safe queueing next replay op" << dendl; - mds->queue_one_replay(); - } - if (mds->logger) log_stat(); diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc index fdd6e680c468..33af04e36cd7 100644 --- a/src/mds/MDSRank.cc +++ b/src/mds/MDSRank.cc @@ -1253,9 +1253,7 @@ void MDSRank::clientreplay_start() bool MDSRank::queue_one_replay() { if (replay_queue.empty()) { - if (mdcache->get_num_client_requests() == 0) { - clientreplay_done(); - } + clientreplay_done(); return false; } queue_waiter(replay_queue.front()); diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 40d9fd8db3f7..7bd12170f2aa 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -963,6 +963,7 @@ void Server::force_clients_readonly() void Server::journal_and_reply(MDRequestRef& mdr, CInode *in, CDentry *dn, LogEvent *le, MDSInternalContextBase *fin) { dout(10) << "journal_and_reply tracei " << in << " tracedn " << dn << dendl; + assert(!mdr->has_completed); // note trace items for eventual reply. mdr->tracei = in; -- 2.47.3