From: Yehuda Sadeh <yehuda@inktank.com>
Date: Fri, 14 Jun 2013 22:01:33 +0000 (-0700)
Subject: rgw: bucket marker contains zone name
X-Git-Tag: v0.67-rc1~128^2~25^2~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=37cc85ed45a6c88646f25ed7c81a44e83f31d76a;p=ceph.git

rgw: bucket marker contains zone name

(issue 5347)
We need this so that raw object names on different zones within
the same region don't collide.

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

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 88fbc891e43..e12fd4ff583 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -1670,7 +1670,7 @@ int RGWRados::create_bucket(string& owner, rgw_bucket& bucket,
     uint64_t iid = instance_id();
     uint64_t bid = next_bucket_id();
     char buf[32];
-    snprintf(buf, sizeof(buf), "%llu.%llu", (long long)iid, (long long)bid); 
+    snprintf(buf, sizeof(buf), "%s.%llu.%llu", zone.name.c_str(), (long long)iid, (long long)bid);
     bucket.marker = buf;
     bucket.bucket_id = bucket.marker;