From d0569f913340cb251c1a49f1e470b176d8b34346 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Sat, 24 Sep 2016 10:01:00 -0700 Subject: [PATCH] radosgw-admin: bucket reshard needs --num-shards to be specified Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_admin.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index bff59be3c3201..5f46f6e1b3b94 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -2165,6 +2165,7 @@ int main(int argc, char **argv) string job_id; int num_shards = 0; + bool num_shards_specified = false; int max_concurrent_ios = 32; uint64_t orphan_stale_secs = (24 * 3600); @@ -2302,6 +2303,7 @@ int main(int argc, char **argv) cerr << "ERROR: failed to parse num shards: " << err << std::endl; return EINVAL; } + num_shards_specified = true; } else if (ceph_argparse_witharg(args, i, &val, "--max-concurrent-ios", (char*)NULL)) { max_concurrent_ios = (int)strict_strtol(val.c_str(), 10, &err); if (!err.empty()) { @@ -4736,6 +4738,11 @@ next: return EINVAL; } + if (!num_shards_specified) { + cerr << "ERROR: --num-shards not specified" << std::endl; + return EINVAL; + } + RGWBucketInfo bucket_info; map attrs; int ret = init_bucket(tenant, bucket_name, bucket_id, bucket_info, bucket, &attrs); -- 2.39.5