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: abort multipart if upload meta object doesn't exist #19918

Merged
merged 1 commit into from Jan 18, 2018
Merged

rgw: abort multipart if upload meta object doesn't exist #19918

Show file tree
Hide file tree
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
5 changes: 2 additions & 3 deletions src/rgw/rgw_op.cc
View file
Open in desktop
Expand Up @@ -3129,9 +3129,8 @@ int RGWPutObjProcessor_Multipart::do_complete(size_t accounted_size,
rgw_raw_obj raw_meta_obj;

store->obj_to_raw(s->bucket_info.placement_rule, meta_obj, &raw_meta_obj);

r = store->omap_set(raw_meta_obj, p, bl);

const bool must_exist = true;// detect races with abort
r = store->omap_set(raw_meta_obj, p, bl, must_exist);
return r;
}

Expand Down
19 changes: 12 additions & 7 deletions src/rgw/rgw_rados.cc
View file
Open in desktop
Expand Up @@ -12169,7 +12169,7 @@ int RGWRados::omap_get_all(rgw_raw_obj& obj, bufferlist& header,
return 0;
}

int RGWRados::omap_set(rgw_raw_obj& obj, const std::string& key, bufferlist& bl)
int RGWRados::omap_set(rgw_raw_obj& obj, const std::string& key, bufferlist& bl, bool must_exist)
{
rgw_rados_ref ref;
int r = get_raw_obj_ref(obj, &ref);
Expand All @@ -12180,22 +12180,27 @@ int RGWRados::omap_set(rgw_raw_obj& obj, const std::string& key, bufferlist& bl)

map<string, bufferlist> m;
m[key] = bl;

r = ref.ioctx.omap_set(ref.oid, m);

ObjectWriteOperation op;
if (must_exist)
op.assert_exists();
op.omap_set(m);
r = ref.ioctx.operate(ref.oid, &op);
return r;
}

int RGWRados::omap_set(rgw_raw_obj& obj, std::map<std::string, bufferlist>& m)
int RGWRados::omap_set(rgw_raw_obj& obj, std::map<std::string, bufferlist>& m, bool must_exist)
{
rgw_rados_ref ref;
int r = get_raw_obj_ref(obj, &ref);
if (r < 0) {
return r;
}

r = ref.ioctx.omap_set(ref.oid, m);

ObjectWriteOperation op;
if (must_exist)
op.assert_exists();
op.omap_set(m);
r = ref.ioctx.operate(ref.oid, &op);
return r;
}

Expand Down
4 changes: 2 additions & 2 deletions src/rgw/rgw_rados.h
View file
Open in desktop
Expand Up @@ -3364,8 +3364,8 @@ class RGWRados

int omap_get_vals(rgw_raw_obj& obj, bufferlist& header, const std::string& marker, uint64_t count, std::map<string, bufferlist>& m);
int omap_get_all(rgw_raw_obj& obj, bufferlist& header, std::map<string, bufferlist>& m);
int omap_set(rgw_raw_obj& obj, const std::string& key, bufferlist& bl);
int omap_set(rgw_raw_obj& obj, map<std::string, bufferlist>& m);
int omap_set(rgw_raw_obj& obj, const std::string& key, bufferlist& bl, bool must_exist = false);
int omap_set(rgw_raw_obj& obj, map<std::string, bufferlist>& m, bool must_exist = false);
int omap_del(rgw_raw_obj& obj, const std::string& key);
int update_containers_stats(map<string, RGWBucketEnt>& m);
int append_async(rgw_raw_obj& obj, size_t size, bufferlist& bl);
Expand Down