From 6a922e10c4865594d83517a637acf6e8546fe702 Mon Sep 17 00:00:00 2001 From: Shilpa Jagannath Date: Fri, 28 Aug 2020 11:30:04 +0530 Subject: [PATCH] rgw: clean up fixes for extra spaces and indentation. Signed-off-by: Shilpa Jagannath --- src/rgw/rgw_bucket_layout.h | 1 - src/rgw/rgw_common.h | 5 ---- src/rgw/rgw_rados.cc | 1 - src/rgw/rgw_reshard.cc | 49 +++++++++++++++++++------------------ 4 files changed, 25 insertions(+), 31 deletions(-) diff --git a/src/rgw/rgw_bucket_layout.h b/src/rgw/rgw_bucket_layout.h index 7839c51952046..6ba752a2d1686 100644 --- a/src/rgw/rgw_bucket_layout.h +++ b/src/rgw/rgw_bucket_layout.h @@ -66,7 +66,6 @@ void decode(bucket_index_layout& l, bufferlist::const_iterator& bl); struct bucket_index_layout_generation { uint64_t gen = 0; bucket_index_layout layout; - }; void encode(const bucket_index_layout_generation& l, bufferlist& bl, uint64_t f=0); diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index 44cc76e4b5551..baaa8d15dd43f 100644 --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@ -1071,11 +1071,6 @@ struct RGWBucketInfo { // layout of bucket index objects rgw::BucketLayout layout; - // Represents the number of bucket index object shards: - // - value of 0 indicates there is no sharding (this is by default - // before this feature is implemented). - // - value of UINT32_T::MAX indicates this is a blind bucket. - // Represents the shard number for blind bucket. const static uint32_t NUM_SHARDS_BLIND_BUCKET; diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 7b675b61b4078..f66b790d9d77e 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -7892,7 +7892,6 @@ int RGWRados::try_refresh_bucket_info(RGWBucketInfo& info, .set_mtime(pmtime) .set_attrs(pattrs) .set_refresh_version(rv)); - } int RGWRados::put_bucket_instance_info(RGWBucketInfo& info, bool exclusive, diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc index 951846d1e99ff..a312cdd731f8d 100644 --- a/src/rgw/rgw_reshard.cc +++ b/src/rgw/rgw_reshard.cc @@ -603,7 +603,8 @@ int RGWBucketReshard::do_reshard(int num_shards, // place the multipart .meta object on the same shard as its head object obj.index_hash_source = mp.get_key(); } - int ret = store->getRados()->get_target_shard_id(bucket_info.layout.target_index->layout.normal, obj.get_hash_object(), &target_shard_id); + ret = store->getRados()->get_target_shard_id(bucket_info.layout.target_index->layout.normal, + obj.get_hash_object(), &target_shard_id); if (ret < 0) { ldpp_dout(dpp, -1) << "ERROR: get_target_shard_id() returned ret=" << ret << dendl; return ret; @@ -1037,37 +1038,37 @@ int RGWReshard::process_single_logshard(int logshard_num, const DoutPrefixProvid } { - RGWBucketReshard br(store, bucket_info, attrs, nullptr); - ret = br.execute(entry.new_num_shards, max_entries, dpp, false, nullptr, - nullptr, this); - if (ret < 0) { - ldpp_dout(dpp, 0) << __func__ << - ": Error during resharding bucket " << entry.bucket_name << ":" << - cpp_strerror(-ret)<< dendl; - return ret; - } + RGWBucketReshard br(store, bucket_info, attrs, nullptr); + ret = br.execute(entry.new_num_shards, max_entries, dpp, false, nullptr, + nullptr, this); + if (ret < 0) { + ldpp_dout(dpp, 0) << __func__ << + ": Error during resharding bucket " << entry.bucket_name << ":" << + cpp_strerror(-ret)<< dendl; + return ret; + } - ldpp_dout(dpp, 20) << __func__ << - " removing reshard queue entry for bucket " << entry.bucket_name << - dendl; + ldpp_dout(dpp, 20) << __func__ << + " removing reshard queue entry for bucket " << entry.bucket_name << + dendl; - ret = remove(dpp, entry); - if (ret < 0) { - ldpp_dout(dpp, 0) << __func__ << ": Error removing bucket " << - entry.bucket_name << " from resharding queue: " << - cpp_strerror(-ret) << dendl; - return ret; - } + ret = remove(dpp, entry); + if (ret < 0) { + ldpp_dout(dpp, 0) << __func__ << ": Error removing bucket " << + entry.bucket_name << " from resharding queue: " << + cpp_strerror(-ret) << dendl; + return ret; + } } finished_entry: Clock::time_point now = Clock::now(); if (logshard_lock.should_renew(now)) { - ret = logshard_lock.renew(now); - if (ret < 0) { - return ret; - } + ret = logshard_lock.renew(now); + if (ret < 0) { + return ret; + } } entry.get_key(&marker); -- 2.39.5