From 7998c322179dd69a1250937321c3c2bb023e0e57 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Tue, 12 Aug 2014 11:17:47 -0700 Subject: [PATCH] rgw: call throttle_data() even if renew_state() failed Otherwise we're going to leak the aio callback handle. Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_rados.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 65e5de92346..3f561d844ec 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -3046,6 +3046,11 @@ public: */ ret = opstate->renew_state(); if (ret < 0) { + ldout(store->ctx(), 0) << "ERROR: RGWRadosPutObj::handle_data(): failed to renew op state ret=" << ret << dendl; + int r = processor->throttle_data(handle, false); + if (r < 0) { + ldout(store->ctx(), 0) << "ERROR: RGWRadosPutObj::handle_data(): processor->throttle_data() returned " << r << dendl; + } /* could not renew state! might have been marked as cancelled */ return ret; } -- 2.47.3