Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NES-48] object-lock이 걸려 삭제가 안되는 오브젝트를 지울 때 응답이 없는 버그 해결 #52

Merged
merged 1 commit into from
Mar 19, 2024
Merged

[NES-48] object-lock이 걸려 삭제가 안되는 오브젝트를 지울 때 응답이 없는 버그 해결 #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/rgw/rgw_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6609,6 +6609,7 @@ void RGWDeleteMultiObj::execute()
RGWMultiDelXMLParser parser;
RGWObjectCtx *obj_ctx = static_cast<RGWObjectCtx *>(s->obj_ctx);

std::vector<rgw_obj_key> run_objects;
map<rgw_obj_key, RGWRados::Object::Delete*> result_map;

char* buf;
Expand Down Expand Up @@ -6729,6 +6730,7 @@ void RGWDeleteMultiObj::execute()
RGWRados::Object* del_target = new RGWRados::Object(store->getRados(), s->bucket_info, *obj_ctx, obj);
RGWRados::Object::Delete* del_op = new RGWRados::Object::Delete(del_target);

run_objects.push_back(obj.key);
tod_pool->run(s, store, del_op, &result_map, &mu_mutex);
}

Expand All @@ -6737,7 +6739,7 @@ void RGWDeleteMultiObj::execute()
op_ret = 0;

wrap_up:
for (iter = multi_delete->objects.begin(); iter != multi_delete->objects.end(); ++iter) {
for (iter = run_objects.begin(); iter != run_objects.end(); ++iter) {
rgw_obj_key each_obj_key = *iter;

map<rgw_obj_key, RGWRados::Object::Delete*>::iterator found;
Expand Down