From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 24 May 2017 23:58:19 +0000 (-0700)
Subject: rgw: bucket_id does not include bucket name
X-Git-Tag: ses5-milestone6~8^2~7^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ed72675ba2cbfd48abcbf1064856b55904815c71;p=ceph.git

rgw: bucket_id does not include bucket name

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index d607e61a27f0..450a9a31b3c5 100644
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -711,11 +711,11 @@ int RGWReshard::process_single_logshard(int logshard_num)
 	  return ret;
 	}
 
-	entry.new_instance_id = entry.bucket_name + ":" + new_bucket_info.bucket.bucket_id;
+	entry.new_instance_id = new_bucket_info.bucket.bucket_id;
 
 	ret = add(entry);
 	if (ret < 0) {
-	  ldout(cct, 0) << __func__ << ":Error in updateing entry bucket " << entry.bucket_name << ": " <<
+	  ldout(cct, 0) << __func__ << ":Error in updating entry bucket " << entry.bucket_name << ": " <<
 	    cpp_strerror(-ret) << dendl;
 	  return ret;
 	}