]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: miis trivial cleanup 16386/head
authorJiaying Ren <jiaying.ren@umcloud.com>
Mon, 19 Jun 2017 15:35:46 +0000 (23:35 +0800)
committerJiaying Ren <jiaying.ren@umcloud.com>
Wed, 19 Jul 2017 03:39:05 +0000 (11:39 +0800)
+ drop outdated & misplaced function description
+ drop unused func find_placement

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h

index b116eea2b73741b8453df22ba88e8da9f4284e13..fb25357888f4c8bea047e048dfdf0851c9515810 100644 (file)
@@ -5743,10 +5743,6 @@ void RGWRados::create_bucket_id(string *bucket_id)
   *bucket_id = buf;
 }
 
-/**
- * create a bucket with name bucket and the given list of attrs
- * returns 0 on success, -ERR# otherwise.
- */
 int RGWRados::create_bucket(RGWUserInfo& owner, rgw_bucket& bucket,
                             const string& zonegroup_id,
                             const string& placement_rule,
index 6b996c960bfbfb886bf098babdeec958aa6ea41a..76be577d4040819a79600bbc1d304b0a46d7b0d3 100644 (file)
@@ -1274,19 +1274,6 @@ struct RGWZoneParams : RGWSystemMetaObj {
   void decode_json(JSONObj *obj);
   static void generate_test_instances(list<RGWZoneParams*>& o);
 
-  bool find_placement(const rgw_data_placement_target& placement, string *placement_id) {
-    for (const auto& pp : placement_pools) {
-      const RGWZonePlacementInfo& info = pp.second;
-      if (info.index_pool == placement.index_pool.to_str() &&
-          info.data_pool == placement.data_pool.to_str() &&
-          info.data_extra_pool == placement.data_extra_pool.to_str()) {
-        *placement_id = pp.first;
-        return true;
-      }
-    }
-    return false;
-  }
-
   bool get_placement(const string& placement_id, RGWZonePlacementInfo *placement) const {
     auto iter = placement_pools.find(placement_id);
     if (iter == placement_pools.end()) {
@@ -2595,10 +2582,6 @@ public:
 
   int create_pool(const rgw_pool& pool);
 
-  /**
-   * create a bucket with name bucket and the given list of attrs
-   * returns 0 on success, -ERR# otherwise.
-   */
   int init_bucket_index(RGWBucketInfo& bucket_info, int num_shards);
   int select_bucket_placement(RGWUserInfo& user_info, const string& zonegroup_id, const string& rule,
                               string *pselected_rule_name, RGWZonePlacementInfo *rule_info);