RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-28 22:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: link_pending_requests() fixes

Browse Source 
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>
This commit is contained in:
Yehuda Sadeh 2016-01-13 16:36:21 -08:00
parent ee9f206504
commit 22faa002a7
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/rgw/rgw_http_client.cc
View File

@ -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();
}