diff options
| author | Yehuda Sadeh <yehuda@inktank.com> | 2013-06-14 15:01:33 -0700 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@inktank.com> | 2013-06-14 15:01:33 -0700 |
| commit | 37cc85ed45a6c88646f25ed7c81a44e83f31d76a (patch) | |
| tree | ddc5a280c9f02dfab862cfee8f1de6545113da12 | |
| parent | 7ec64db4fd0892c67907065bcb8e28d735fe00a5 (diff) | |
| download | ceph-37cc85ed45a6c88646f25ed7c81a44e83f31d76a.tar.gz | |
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>
| -rw-r--r-- | src/rgw/rgw_rados.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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; |