From: Nathan Cutler <presnypreklad@gmail.com>
Date: Tue, 12 Sep 2017 19:55:14 +0000 (+0200)
Subject: Merge pull request #16856 from prallabh/wip-20895
X-Git-Tag: v10.2.10~26
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bd918be29cd31f0ef6dac64edbfaf40f38ae2e07;p=ceph.git

Merge pull request #16856 from prallabh/wip-20895

jewel: rgw: bucket index check in radosgw-admin removes valid index

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
---

bd918be29cd31f0ef6dac64edbfaf40f38ae2e07
diff --cc src/rgw/rgw_bucket.cc
index 484f4f97846e7,fbe86f8994d4c..050905c2b1cc6
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@@ -1007,11 -1013,11 +1007,11 @@@ int RGWBucket::check_bad_index_multipar
    bool fix_index = op_state.will_fix_index();
    rgw_bucket bucket = op_state.get_bucket();
  
 -  int max = 1000;
 +  size_t max = 1000;
  
    map<string, bool> common_prefixes;
-   string ns = "";
  
+   string ns = "multipart";
    bool is_truncated;
    map<string, bool> meta_objs;
    map<rgw_obj_key, string> all_objs;