From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Mon, 9 May 2016 09:41:19 +0000 (+0200)
Subject: rgw: log name instead of id for SystemMetaObj on failure
X-Git-Tag: v11.0.0~627^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aee1d643be71071df488fbe790a6715e93aa4385;p=ceph.git

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>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 1d4a846db33f..ac003646a17b 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -383,8 +383,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;
       }
     }
   }