From 4dae50d8a0ffe3f3491eae62950fe46229aaa0e6 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Fri, 6 Dec 2013 16:03:20 -0800 Subject: [PATCH] objecter: don't take extra throttle budget for resent ops These ops have already taken their budget in the original op_submit(). It will be returned via put_op_budget() when they complete. If there were many localized reads of missing objects from replicas, or cache pool redirects, this would cause the objecter to use up all of its op throttle budget and hang. Signed-off-by: Josh Durgin (cherry picked from commit 8d0180b1b7b48662daef199931efc7f2a6a1c431) Conflicts: src/osdc/Objecter.cc --- src/osdc/Objecter.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 4934dba700eec..b33ef277df440 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -1561,7 +1561,7 @@ void Objecter::handle_osd_op_reply(MOSDOpReply *m) num_unacked--; if (op->oncommit) num_uncommitted--; - op_submit(op); + _op_submit(op); m->put(); return; } -- 2.39.5