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

jewel: rgw: Have a flavor of bucket deletion in radosgw-admin to bypass garbage collection #10661

Merged
merged 1 commit into from Feb 1, 2017
Merged

jewel: rgw: Have a flavor of bucket deletion in radosgw-admin to bypass garbage collection #10661

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
18 changes: 16 additions & 2 deletions src/rgw/rgw_admin.cc
View file
Open in desktop
Expand Up @@ -228,6 +228,10 @@ void _usage()
cout << " --caps=<caps> list of caps (e.g., \"usage=read, write; user=read\"\n";
cout << " --yes-i-really-mean-it required for certain operations\n";
cout << " --reset-regions reset regionmap when regionmap update\n";
cout << " --bypass-gc when specified with bucket deletion, triggers\n";
cout << " object deletions by not involving GC\n";
cout << " --inconsistent-index when specified with bucket deletion and bypass-gc set to true,\n";
cout << " ignores bucket index consistency\n";
cout << "\n";
cout << "<date> := \"YYYY-MM-DD[ hh:mm:ss]\"\n";
cout << "\nQuota options:\n";
Expand Down Expand Up @@ -2037,6 +2041,8 @@ int main(int argc, char **argv)

int sync_stats = false;
int reset_regions = false;
int bypass_gc = false;
int inconsistent_index = false;

int extra_info = false;

Expand Down Expand Up @@ -2250,7 +2256,10 @@ int main(int argc, char **argv)
// do nothing
} else if (ceph_argparse_binary_flag(args, i, &extra_info, NULL, "--extra-info", (char*)NULL)) {
// do nothing
} else if (ceph_argparse_binary_flag(args, i, &reset_regions, NULL, "--reset-regions", (char*)NULL)) {
} else if (ceph_argparse_binary_flag(args, i, &bypass_gc, NULL, "--bypass-gc", (char*)NULL)) {
// do nothing
} else if (ceph_argparse_binary_flag(args, i, &inconsistent_index, NULL, "--inconsistent-index", (char*)NULL)) {
// do nothing
} else if (ceph_argparse_witharg(args, i, &val, "--caps", (char*)NULL)) {
caps = val;
} else if (ceph_argparse_witharg(args, i, &val, "-i", "--infile", (char*)NULL)) {
Expand Down Expand Up @@ -3718,6 +3727,7 @@ int main(int argc, char **argv)
bucket_op.set_check_objects(check_objects);
bucket_op.set_delete_children(delete_child_objects);
bucket_op.set_fix_index(fix);
bucket_op.set_max_aio(max_concurrent_ios);

// required to gather errors from operations
std::string err_msg;
Expand Down Expand Up @@ -4665,7 +4675,11 @@ int main(int argc, char **argv)
}

if (opt_cmd == OPT_BUCKET_RM) {
RGWBucketAdminOp::remove_bucket(store, bucket_op);
if (inconsistent_index == false) {
RGWBucketAdminOp::remove_bucket(store, bucket_op, bypass_gc, true);
} else {
RGWBucketAdminOp::remove_bucket(store, bucket_op, bypass_gc, false);
}
}

if (opt_cmd == OPT_GC_LIST) {
Expand Down
194 changes: 185 additions & 9 deletions src/rgw/rgw_bucket.cc
View file
Open in desktop
Expand Up @@ -19,6 +19,7 @@
#include "rgw_user.h"
#include "rgw_string.h"

#include "include/rados/librados.hpp"
// until everything is moved from rgw_common
#include "rgw_common.h"

Expand Down Expand Up @@ -531,9 +532,7 @@ int rgw_remove_bucket(RGWRados *store, rgw_bucket& bucket, bool delete_children)
map<RGWObjCategory, RGWStorageStats> stats;
std::vector<RGWObjEnt> objs;
map<string, bool> common_prefixes;
rgw_obj obj;
RGWBucketInfo info;
bufferlist bl;
RGWObjectCtx obj_ctx(store);

string bucket_ver, master_ver;
Expand All @@ -542,8 +541,6 @@ int rgw_remove_bucket(RGWRados *store, rgw_bucket& bucket, bool delete_children)
if (ret < 0)
return ret;

obj.bucket = bucket;

ret = store->get_bucket_info(obj_ctx, bucket.tenant, bucket.name, info, NULL);
if (ret < 0)
return ret;
Expand All @@ -562,7 +559,7 @@ int rgw_remove_bucket(RGWRados *store, rgw_bucket& bucket, bool delete_children)

while (!objs.empty()) {
std::vector<RGWObjEnt>::iterator it = objs.begin();
for (it = objs.begin(); it != objs.end(); ++it) {
for (; it != objs.end(); ++it) {
ret = rgw_remove_object(store, info, bucket, (*it).key);
if (ret < 0)
return ret;
Expand Down Expand Up @@ -596,6 +593,172 @@ int rgw_remove_bucket(RGWRados *store, rgw_bucket& bucket, bool delete_children)
return ret;
}

static int aio_wait(librados::AioCompletion *handle)
{
librados::AioCompletion *c = (librados::AioCompletion *)handle;
c->wait_for_complete();
int ret = c->get_return_value();
c->release();
return ret;
}

static int drain_handles(list<librados::AioCompletion *>& pending)
{
int ret = 0;
while (!pending.empty()) {
librados::AioCompletion *handle = pending.front();
pending.pop_front();
int r = aio_wait(handle);
if (r < 0) {
ret = r;
}
}
return ret;
}

int rgw_remove_bucket_bypass_gc(RGWRados *store, rgw_bucket& bucket,
int concurrent_max, bool keep_index_consistent)
{
int ret;
map<RGWObjCategory, RGWStorageStats> stats;
std::vector<RGWObjEnt> objs;
map<string, bool> common_prefixes;
RGWBucketInfo info;
RGWObjectCtx obj_ctx(store);

string bucket_ver, master_ver;

ret = store->get_bucket_stats(bucket, RGW_NO_SHARD, &bucket_ver, &master_ver, stats, NULL);
if (ret < 0)
return ret;

ret = store->get_bucket_info(obj_ctx, bucket.tenant, bucket.name, info, NULL);
if (ret < 0)
return ret;


RGWRados::Bucket target(store, info);
RGWRados::Bucket::List list_op(&target);

list_op.params.list_versions = true;

std::list<librados::AioCompletion*> handles;

int max = 1000;
int max_aio = concurrent_max;
ret = list_op.list_objects(max, &objs, &common_prefixes, NULL);
if (ret < 0)
return ret;

while (!objs.empty()) {
std::vector<RGWObjEnt>::iterator it = objs.begin();
for (; it != objs.end(); ++it) {
RGWObjState *astate = NULL;
rgw_obj obj(bucket, (*it).key.name);
obj.set_instance((*it).key.instance);

ret = store->get_obj_state(&obj_ctx, obj, &astate, NULL);
if (ret == -ENOENT) {
dout(1) << "WARNING: cannot find obj state for obj " << obj.get_object() << dendl;
continue;
}
if (ret < 0) {
lderr(store->ctx()) << "ERROR: get obj state returned with error " << ret << dendl;
return ret;
}

if (astate->has_manifest) {
rgw_obj head_obj;
RGWObjManifest& manifest = astate->manifest;
RGWObjManifest::obj_iterator miter = manifest.obj_begin();

if (miter.get_location().ns.empty()) {
head_obj = miter.get_location();
}

for (; miter != manifest.obj_end() && max_aio--; ++miter) {
if (!max_aio) {
ret = drain_handles(handles);
if (ret < 0) {
lderr(store->ctx()) << "ERROR: could not drain handles as aio completion returned with " << ret << dendl;
return ret;
}
max_aio = concurrent_max;
}

rgw_obj last_obj = miter.get_location();
if (last_obj == head_obj) {
// have the head obj deleted at the end
continue;
}

ret = store->delete_obj_aio(last_obj, bucket, info, astate, handles, keep_index_consistent);
if (ret < 0) {
lderr(store->ctx()) << "ERROR: delete obj aio failed with " << ret << dendl;
return ret;
}
} // for all shadow objs

ret = store->delete_obj_aio(head_obj, bucket, info, astate, handles, keep_index_consistent);
if (ret < 0) {
lderr(store->ctx()) << "ERROR: delete obj aio failed with " << ret << dendl;
return ret;
}
}

if (!max_aio) {
ret = drain_handles(handles);
if (ret < 0) {
lderr(store->ctx()) << "ERROR: could not drain handles as aio completion returned with " << ret << dendl;
return ret;
}
max_aio = concurrent_max;
}
} // for all RGW objects
objs.clear();

ret = list_op.list_objects(max, &objs, &common_prefixes, NULL);
if (ret < 0)
return ret;
}

ret = drain_handles(handles);
if (ret < 0) {
lderr(store->ctx()) << "ERROR: could not drain handles as aio completion returned with " << ret << dendl;
return ret;
}

ret = rgw_bucket_sync_user_stats(store, bucket.tenant, bucket.name);
if (ret < 0) {
dout(1) << "WARNING: failed sync user stats before bucket delete. ret=" << ret << dendl;
}

RGWObjVersionTracker objv_tracker;

ret = rgw_bucket_delete_bucket_obj(store, bucket.tenant, bucket.name, objv_tracker);
if (ret < 0) {
lderr(store->ctx()) << "ERROR: could not remove bucket " << bucket.name << "with ret as " << ret << dendl;
return ret;
}

if (!store->is_syncing_bucket_meta(bucket)) {
RGWObjVersionTracker objv_tracker;
string entry = bucket.get_key();
ret = rgw_bucket_instance_remove_entry(store, entry, &objv_tracker);
if (ret < 0) {
lderr(store->ctx()) << "ERROR: could not remove bucket instance entry" << bucket.name << "with ret as " << ret << dendl;
return ret;
}
}

ret = rgw_unlink_bucket(store, info.owner, bucket.tenant, bucket.name, false);
if (ret < 0) {
lderr(store->ctx()) << "ERROR: unable to remove user bucket information" << dendl;
}

return ret;
}

int rgw_bucket_delete_bucket_obj(RGWRados *store,
const string& tenant_name,
const string& bucket_name,
Expand Down Expand Up @@ -761,12 +924,24 @@ int RGWBucket::unlink(RGWBucketAdminOpState& op_state, std::string *err_msg)
return r;
}

int RGWBucket::remove(RGWBucketAdminOpState& op_state, std::string *err_msg)
int RGWBucket::remove(RGWBucketAdminOpState& op_state, bool bypass_gc,
bool keep_index_consistent, std::string *err_msg)
{
bool delete_children = op_state.will_delete_children();
rgw_bucket bucket = op_state.get_bucket();
int ret;

if (bypass_gc) {
if (delete_children) {
ret = rgw_remove_bucket_bypass_gc(store, bucket, op_state.get_max_aio(), keep_index_consistent);
} else {
set_err_msg(err_msg, "purge objects should be set for gc to be bypassed");
return -EINVAL;
}
} else {
ret = rgw_remove_bucket(store, bucket, delete_children);
}

int ret = rgw_remove_bucket(store, bucket, delete_children);
if (ret < 0) {
set_err_msg(err_msg, "unable to remove bucket" + cpp_strerror(-ret));
return ret;
Expand Down Expand Up @@ -1173,15 +1348,16 @@ int RGWBucketAdminOp::check_index(RGWRados *store, RGWBucketAdminOpState& op_sta
return 0;
}

int RGWBucketAdminOp::remove_bucket(RGWRados *store, RGWBucketAdminOpState& op_state)
int RGWBucketAdminOp::remove_bucket(RGWRados *store, RGWBucketAdminOpState& op_state,
bool bypass_gc, bool keep_index_consistent)
{
RGWBucket bucket;

int ret = bucket.init(store, op_state);
if (ret < 0)
return ret;

return bucket.remove(op_state);
return bucket.remove(op_state, bypass_gc, keep_index_consistent);
}

int RGWBucketAdminOp::remove_object(RGWRados *store, RGWBucketAdminOpState& op_state)
Expand Down
9 changes: 7 additions & 2 deletions src/rgw/rgw_bucket.h
View file
Open in desktop
Expand Up @@ -178,6 +178,7 @@ extern int rgw_unlink_bucket(RGWRados *store, const rgw_user& user_id,

extern int rgw_remove_object(RGWRados *store, RGWBucketInfo& bucket_info, rgw_bucket& bucket, rgw_obj_key& key);
extern int rgw_remove_bucket(RGWRados *store, rgw_bucket& bucket, bool delete_children);
extern int rgw_remove_bucket_bypass_gc(RGWRados *store, rgw_bucket& bucket, int concurrent_max);

extern int rgw_bucket_set_attrs(RGWRados *store, RGWBucketInfo& bucket_info,
map<string, bufferlist>& attrs,
Expand All @@ -198,6 +199,7 @@ struct RGWBucketAdminOpState {
bool fix_index;
bool delete_child_objects;
bool bucket_stored;
int max_aio;

rgw_bucket bucket;

Expand All @@ -206,6 +208,8 @@ struct RGWBucketAdminOpState {
void set_fix_index(bool value) { fix_index = value; }
void set_delete_children(bool value) { delete_child_objects = value; }

void set_max_aio(int value) { max_aio = value; }

void set_user_id(rgw_user& user_id) {
if (!user_id.empty())
uid = user_id;
Expand Down Expand Up @@ -240,6 +244,7 @@ struct RGWBucketAdminOpState {
bool is_user_op() { return !uid.empty(); }
bool is_system_op() { return uid.empty(); }
bool has_bucket_stored() { return bucket_stored; }
int get_max_aio() { return max_aio; }

RGWBucketAdminOpState() : list_buckets(false), stat_buckets(false), check_objects(false),
fix_index(false), delete_child_objects(false),
Expand Down Expand Up @@ -279,7 +284,7 @@ class RGWBucket
map<RGWObjCategory, RGWStorageStats>& calculated_stats,
std::string *err_msg = NULL);

int remove(RGWBucketAdminOpState& op_state, std::string *err_msg = NULL);
int remove(RGWBucketAdminOpState& op_state, bool bypass_gc = false, bool keep_index_consistent = true, std::string *err_msg = NULL);
int link(RGWBucketAdminOpState& op_state, std::string *err_msg = NULL);
int unlink(RGWBucketAdminOpState& op_state, std::string *err_msg = NULL);

Expand All @@ -306,7 +311,7 @@ class RGWBucketAdminOp
static int check_index(RGWRados *store, RGWBucketAdminOpState& op_state,
RGWFormatterFlusher& flusher);

static int remove_bucket(RGWRados *store, RGWBucketAdminOpState& op_state);
static int remove_bucket(RGWRados *store, RGWBucketAdminOpState& op_state, bool bypass_gc = false, bool keep_index_consistent = true);
static int remove_object(RGWRados *store, RGWBucketAdminOpState& op_state);
static int info(RGWRados *store, RGWBucketAdminOpState& op_state, RGWFormatterFlusher& flusher);
};
Expand Down