From 37cc85ed45a6c88646f25ed7c81a44e83f31d76a Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Fri, 14 Jun 2013 15:01:33 -0700 Subject: [PATCH] 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 --- src/rgw/rgw_rados.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 88fbc891e438a..e12fd4ff5839a 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; -- 2.39.5