Skip to content

Commit

Permalink
rgw: bucket index check in radosgw-admin removes valid index.
Browse files Browse the repository at this point in the history
Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit a786252)
Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>

Conflicts:
	src/rgw/rgw_bucket.cc
		Jewel has RGWObjEnt, honor the same while populating obj oid
  • Loading branch information
Zhang Shaowen authored and prallabh committed Aug 10, 2017
1 parent 5776904 commit ff67388
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/rgw/rgw_bucket.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1016,8 +1016,8 @@ int RGWBucket::check_bad_index_multipart(RGWBucketAdminOpState& op_state,
int 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;
Expand All @@ -1034,6 +1034,7 @@ int RGWBucket::check_bad_index_multipart(RGWBucketAdminOpState& op_state,
RGWRados::Bucket::List list_op(&target);

list_op.params.list_versions = true;
list_op.params.ns = ns;

do {
vector<RGWObjEnt> result;
Expand Down Expand Up @@ -2131,7 +2132,7 @@ class RGWBucketMetadataHandler : public RGWMetadataHandler {
return ret;

/*
* We're unlinking the bucket but we don't want to update the entrypoint here we're removing
* We're unlinking the bucket but we don't want to update the entrypoint here - we're removing
* it immediately and don't want to invalidate our cached objv_version or the bucket obj removal
* will incorrectly fail.
*/
Expand Down

0 comments on commit ff67388

Please sign in to comment.