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

rgw: fix deletion of index completion object

Browse Source 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
This commit is contained in:
Yehuda Sadeh 2017-05-17 14:50:53 -07:00
parent 94e3c380ab
commit 42b3ee12ea
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/rgw/rgw_rados.cc
View File

@ -3525,7 +3525,7 @@ public:
list<cls_rgw_obj_key>& remove_objs, bool log_op,
uint16_t bilog_op,
complete_op_data **result);
void handle_completion(completion_t cb, complete_op_data *arg);
bool handle_completion(completion_t cb, complete_op_data *arg);
int start() {
completion_thread = new RGWIndexCompletionThread(store);
@ -3560,9 +3560,13 @@ static void obj_complete_cb(completion_t cb, void *arg)
if (completion->stopped) {
completion->lock.Unlock(); /* can drop lock, no one else is referencing us */
delete completion;
return;
}
((complete_op_data *)arg)->manager->handle_completion(cb, completion);
bool need_delete = completion->manager->handle_completion(cb, completion);
completion->lock.Unlock();
if (need_delete) {
delete completion;
}
}
@ -3599,7 +3603,7 @@ void RGWIndexCompletionManager::create_completion(const rgw_obj& obj,
completions[shard_id].insert(entry);
}
void RGWIndexCompletionManager::handle_completion(completion_t cb, complete_op_data *arg)
bool RGWIndexCompletionManager::handle_completion(completion_t cb, complete_op_data *arg)
{
int shard_id = arg->manager_shard_id;
{
@ -3609,7 +3613,7 @@ void RGWIndexCompletionManager::handle_completion(completion_t cb, complete_op_d
auto iter = comps.find(arg);
if (iter == comps.end()) {
return;
return true;
}
comps.erase(iter);
@ -3617,10 +3621,10 @@ void RGWIndexCompletionManager::handle_completion(completion_t cb, complete_op_d
int r = rados_aio_get_return_value(cb);
if (r != -ERR_BUSY_RESHARDING) {
delete arg;
return;
return true;
}
completion_thread->add_completion(arg);
return false;
}
void RGWRados::finalize()