diff options
| author | Casey Bodley <cbodley@users.noreply.github.com> | 2020-05-01 18:31:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 18:31:49 +0200 |
| commit | 83cea4f3b7066ce318c69916589a777d952bbbd4 (patch) | |
| tree | 28c644c1ba9715269dc8201a31055e045a6e082b | |
| parent | Merge pull request #34787 from trociny/wip-45305 (diff) | |
| parent | rgw/rgw_bucket: clear tenant string for non tenanted buckets (diff) | |
| download | ceph-83cea4f3b7066ce318c69916589a777d952bbbd4.tar.xz ceph-83cea4f3b7066ce318c69916589a777d952bbbd4.zip | |
Merge pull request #34877 from vumrao/wip-vumrao-45355
rgw/rgw_bucket: clear tenant string for non tenanted buckets in rgw_bucket_parse_bucket_key function.
Reviewed-by: Casey Bodley <cbodley@redhat.com>
| -rw-r--r-- | src/rgw/rgw_bucket.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index 8b2eb75cafa..faba8dadc52 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -207,6 +207,8 @@ int rgw_bucket_parse_bucket_key(CephContext *cct, const string& key, auto tenant = name.substr(0, pos); bucket->tenant.assign(tenant.begin(), tenant.end()); name = name.substr(pos + 1); + } else { + bucket->tenant.clear(); } // split name:instance |