From: Yehuda Sadeh <yehuda@redhat.com>
Date: Mon, 30 Nov 2015 19:56:03 +0000 (-0800)
Subject: rgw: objexp hint name backward compatibility
X-Git-Tag: v10.0.2~127^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9425b04a706fd53764c09181def42676a1bba800;p=ceph-ci.git

rgw: objexp hint name backward compatibility

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

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index dd152d0c533..7a878d78c7a 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -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;
 }