rgw: log name instead of id for SystemMetaObj on failure

Currently if we fail to read a SystemMetaObj we try to log the
MetaObject id, however this will not be set mostly as read_id has
failed, so we end up logging an empty id, changing this to log
the object name instead

Fixes: http://tracker.ceph.com/issues/15776
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit e9f896a9efea74c42d56dd5a7feb8b8710d6becc)

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 93b2e1bdbf33ba2b04198c2b614c2431e40118f5..2643ae6d30c65fa81a8fa63f1dcaa0c09d51ac64 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -388,8 +388,8 @@ int RGWSystemMetaObj::init(CephContext *_cct, RGWRados *_store, bool setup_obj,
     } else if (!old_format) {
       r = read_id(name, id);
       if (r < 0) {
-       ldout(cct, 0) << "error in read_id for id " << id << " : " << cpp_strerror(-r) << dendl;
-       return r;
+        ldout(cct, 0) << "error in read_id for object name: " << name << " : " << cpp_strerror(-r) << dendl;
+        return r;
       }
     }
   }