From: Yehuda Sadeh <yehuda@inktank.com>
Date: Mon, 24 Jun 2013 05:34:24 +0000 (-0700)
Subject: rgw: data log contains bucket instance info in key
X-Git-Tag: v0.67-rc1~128^2~49
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=76228caf65627fff1845289687380706d24a14aa;p=ceph.git

rgw: data log contains bucket instance info in key

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

diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
index d7ca725c83a6..419f40b5c2d5 100644
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@ -1016,7 +1016,7 @@ int RGWDataChangesLog::renew_entries()
     rgw_data_change change;
     bufferlist bl;
     change.entity_type = ENTITY_TYPE_BUCKET;
-    change.key = bucket.name;
+    change.key = bucket.name + ":" + bucket.bucket_id;
     change.timestamp = ut;
     ::encode(change, bl);
 
@@ -1137,7 +1137,7 @@ int RGWDataChangesLog::add_entry(rgw_bucket& bucket) {
     bufferlist bl;
     rgw_data_change change;
     change.entity_type = ENTITY_TYPE_BUCKET;
-    change.key = bucket.name;
+    change.key = bucket.name + ":" + bucket.bucket_id;
     change.timestamp = now;
     ::encode(change, bl);
     string section;