]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw: objexp hint name backward compatibility
authorYehuda Sadeh <yehuda@redhat.com>
Mon, 30 Nov 2015 19:56:03 +0000 (11:56 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Wed, 2 Dec 2015 18:45:41 +0000 (10:45 -0800)
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_rados.cc

index dd152d0c533b2967b3c5ed804b06da079a9baa2e..7a878d78c7aff99d5054f78da530a67b7576515a 100644 (file)
@@ -2399,7 +2399,7 @@ static string objexp_hint_get_keyext(const string& tenant_name,
                                      const string& bucket_id,
                                      const rgw_obj_key& obj_key)
 {
-  return tenant_name + ":" + bucket_name + ":" + bucket_id +
+  return tenant_name + (tenant_name.empty() ? "" : ":") + bucket_name + ":" + bucket_id +
       ":" + obj_key.name + ":" + obj_key.instance;
 }