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 d7ca725c83a664d4c73bfff112e0dd82cda527bf..419f40b5c2d56e7d137d48c92cf76009a5fb79a8 100644 (file)
--- 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;