From 601e63e9b491023e9f56062c980bad98f07faeb3 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 24 Jan 2017 23:53:39 -0500 Subject: [PATCH] client: remove dead log code The preceding if statement has always checked if mds_requests has no request for the given tid. I don't know how the assert was ever triggered during work on 3b520b5. Partial revert of 3b520b5173d96db5ffc30ed31a92760f3910e733. Signed-off-by: Patrick Donnelly --- src/client/Client.cc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 382d2168e74..7ec8b18a810 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -2260,17 +2260,11 @@ void Client::handle_client_reply(MClientReply *reply) reply->put(); return; } + MetaRequest *request = mds_requests.at(tid); ldout(cct, 20) << "handle_client_reply got a reply. Safe:" << is_safe << " tid " << tid << dendl; - MetaRequest *request = mds_requests[tid]; - if (!request) { - ldout(cct, 0) << "got an unknown reply (probably duplicate) on tid " << tid << " from mds " - << mds_num << " safe: " << is_safe << dendl; - reply->put(); - return; - } - + if (request->got_unsafe && !is_safe) { //duplicate response ldout(cct, 0) << "got a duplicate reply on tid " << tid << " from mds " -- 2.47.3