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

Jump to bottom

rgw: optimize function abort_bucket_multiparts #19710

Merged
merged 1 commit into from
Jan 8, 2018
Merged

rgw: optimize function abort_bucket_multiparts #19710

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/rgw/rgw_multi.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,23 +270,21 @@ int abort_bucket_multiparts(RGWRados *store, CephContext *cct, RGWBucketInfo& bu
vector<rgw_bucket_dir_entry> objs;
RGWObjectCtx obj_ctx(store);
string marker;
map<string, bool> common_prefixes;
bool is_truncated;

do {
ret = list_bucket_multiparts(store, bucket_info, prefix, marker, delim,
max, &objs, &common_prefixes, &is_truncated);
max, &objs, nullptr, &is_truncated);
if (ret < 0) {
return ret;
}
if (!objs.empty()) {
RGWMultipartUploadEntry entry;
RGWMPObj mp;
for (const auto& obj : objs) {
rgw_obj_key key(obj.key);
if (!entry.mp.from_meta(key.name))
if (!mp.from_meta(key.name))
continue;
entry.obj = obj;
ret = abort_multipart_upload(store, cct, &obj_ctx, bucket_info, entry.mp);
ret = abort_multipart_upload(store, cct, &obj_ctx, bucket_info, mp);
if (ret < 0) {
return ret;
}
Expand Down