rgw: clean up fixes for extra spaces and indentation.

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>

diff --git a/src/rgw/rgw_bucket_layout.h b/src/rgw/rgw_bucket_layout.h
index 7839c519520469c3440dbe2f96d38f4c61884564..6ba752a2d1686ccec1c5d201fd2251a5cb6877c1 100644 (file)
--- 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 67a11f430bc0dc89c5c987fa126e6d88fe4e5594..f5a9d572cd85aa8367dd8f5814cfe2224746c6ad 100644 (file)
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -1072,11 +1072,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 0a80cded1056ae2bdca07b550bf08d674cb9f43f..065eff728599d677f3069dfee60622b89fe58dd2 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -7908,7 +7908,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 951846d1e99ffcf1815093f6f2dee129072b8b02..a312cdd731f8df63d320d67db62a174bd43cd0ca 100644 (file)
--- 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);