rgw: link_pending_requests() fixes

set aside the list of reqs we need to finish, and only then iterate
through that list and finish. Otherwise we corrupt the reqs map. Also
clear reqs map on shutdown so that we don't end up clearing it twice
in certain cases.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/src/rgw/rgw_http_client.cc b/src/rgw/rgw_http_client.cc
index c906d948598c3d2ac6bcd15333addb07bad9d69f..1c241ba43d13a988b7e6dc0d39e25469432e81ce 100644 (file)
--- a/src/rgw/rgw_http_client.cc
+++ b/src/rgw/rgw_http_client.cc
@@ -406,14 +406,24 @@ void RGWHTTPManager::link_pending_requests()
 
   map<uint64_t, rgw_http_req_data *>::iterator iter = reqs.find(max_threaded_req);
 
+  list<std::pair<rgw_http_req_data *, int> > remove_reqs;
+
   for (; iter != reqs.end(); ++iter) {
     rgw_http_req_data *req_data = iter->second;
     int r = link_request(req_data);
     if (r < 0) {
       ldout(cct, 0) << "ERROR: failed to link http request" << dendl;
-      _finish_request(req_data, r);
+      remove_reqs.push_back(std::make_pair(iter->second, r));
+    } else {
+      max_threaded_req = iter->first + 1;
     }
-    max_threaded_req = iter->first + 1;
+  }
+
+  for (auto piter : remove_reqs) {
+    rgw_http_req_data *req_data = piter.first;
+    int r = piter.second;
+
+    _finish_request(req_data, r);
   }
 }
 
@@ -606,6 +616,8 @@ void *RGWHTTPManager::reqs_thread_entry()
     _finish_request(iter->second, -ECANCELED);
   }
 
+  reqs.clear();
+
   if (completion_mgr) {
     completion_mgr->go_down();
   }