Merge pull request #24519 from pdvian/wip-36214-luminous

luminous: rgw: fix leak of curl handle on shutdown Reviewed-by: Casey Bodley <cbodley@redhat.com>
ceph · Nov 1, 2018 · c738678 · c738678
2 parents 452fb17 + 97a2729
commit c738678
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/rgw/rgw_http_client.cc b/src/rgw/rgw_http_client.cc
@@ -1134,14 +1134,14 @@ void *RGWHTTPManager::reqs_thread_entry()
 
   RWLock::WLocker rl(reqs_lock);
   for (auto r : unregistered_reqs) {
-    _finish_request(r, -ECANCELED);
+    _unlink_request(r);
   }
 
   unregistered_reqs.clear();
 
   auto all_reqs = std::move(reqs);
   for (auto iter : all_reqs) {
-    _finish_request(iter.second, -ECANCELED);
+    _unlink_request(iter.second);
   }
 
   reqs.clear();