From 7375d027a3f835640dc1154897bee0899b956d22 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 1 Feb 2018 15:20:48 -0800 Subject: [PATCH] mds: remove extra 0x in ino prints Signed-off-by: Patrick Donnelly --- src/mds/CDentry.cc | 10 +++++++++- src/mds/CInode.cc | 6 ++---- src/mds/InoTable.cc | 4 ++-- src/mds/InoTable.h | 2 +- src/mds/MDSRank.cc | 2 +- src/mds/PurgeQueue.cc | 8 +++----- src/mds/RecoveryQueue.cc | 4 ++-- src/mds/journal.cc | 3 +-- 8 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/mds/CDentry.cc b/src/mds/CDentry.cc index cb176010c095d..50c29319c4ee6 100644 --- a/src/mds/CDentry.cc +++ b/src/mds/CDentry.cc @@ -86,7 +86,15 @@ ostream& operator<<(ostream& out, const CDentry& dn) if (dn.is_auth_pinned()) out << " ap=" << dn.get_num_auth_pins() << "+" << dn.get_num_nested_auth_pins(); - out << " ino=" << dn.get_linkage()->get_inode()->ino; + { + const CInode *inode = dn.get_linkage()->get_inode(); + out << " ino="; + if (inode) { + out << inode->ino(); + } else { + out << "(nil)"; + } + } out << " state=" << dn.get_state(); if (dn.is_new()) out << "|new"; diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc index 60b18b978ef8f..3388c03d14920 100644 --- a/src/mds/CInode.cc +++ b/src/mds/CInode.cc @@ -4047,14 +4047,12 @@ next: if (inotable->is_marked_free(inode.ino)) { LogChannelRef clog = in->mdcache->mds->clog; - clog->error() << "scrub: inode wrongly marked free: 0x" << std::hex - << inode.ino; + clog->error() << "scrub: inode wrongly marked free: " << inode.ino; if (in->scrub_infop->header->get_repair()) { bool repaired = inotable->repair(inode.ino); if (repaired) { - clog->error() << "inode table repaired for inode: 0x" << std::hex - << inode.ino; + clog->error() << "inode table repaired for inode: " << inode.ino; inotable->save(); } else { diff --git a/src/mds/InoTable.cc b/src/mds/InoTable.cc index 117280cc0c409..7508ffa28919f 100644 --- a/src/mds/InoTable.cc +++ b/src/mds/InoTable.cc @@ -216,10 +216,10 @@ bool InoTable::repair(inodeno_t id) } assert(is_marked_free(id)); - dout(10) << "repair: before status. ino = 0x" << std::hex << id << " pver =" << projected_version << " ver= " << version << dendl; + dout(10) << "repair: before status. ino = " << id << " pver =" << projected_version << " ver= " << version << dendl; free.erase(id); projected_free.erase(id); projected_version = ++version; - dout(10) << "repair: after status. ino = 0x" << std::hex <get_dirfrag(fg); if (!dir) { - ss << "frag 0x" << std::hex << in->ino() << "/" << fg << " not in cache (" + ss << "frag " << in->ino() << "/" << fg << " not in cache (" "use `dirfrag ls` to see if it should exist)"; return NULL; } diff --git a/src/mds/PurgeQueue.cc b/src/mds/PurgeQueue.cc index 4497cec333a8a..9ba21ef61b11d 100644 --- a/src/mds/PurgeQueue.cc +++ b/src/mds/PurgeQueue.cc @@ -252,7 +252,7 @@ void PurgeQueue::create(Context *fin) */ void PurgeQueue::push(const PurgeItem &pi, Context *completion) { - dout(4) << "pushing inode 0x" << std::hex << pi.ino << std::dec << dendl; + dout(4) << "pushing inode " << pi.ino << dendl; Mutex::Locker l(lock); // Callers should have waited for open() before using us @@ -391,8 +391,7 @@ bool PurgeQueue::_consume() << journaler.get_read_pos() << dendl; on_error->complete(0); } - dout(20) << " executing item (0x" << std::hex << item.ino - << std::dec << ")" << dendl; + dout(20) << " executing item (" << item.ino << ")" << dendl; _execute_item(item, journaler.get_read_pos()); } @@ -527,8 +526,7 @@ void PurgeQueue::_execute_item_complete( ops_in_flight -= _calculate_ops(iter->second); logger->set(l_pq_executing_ops, ops_in_flight); - dout(10) << "completed item for ino 0x" << std::hex << iter->second.ino - << std::dec << dendl; + dout(10) << "completed item for ino " << iter->second.ino << dendl; in_flight.erase(iter); logger->set(l_pq_executing, in_flight.size()); diff --git a/src/mds/RecoveryQueue.cc b/src/mds/RecoveryQueue.cc index d205c6f278b91..600cbbd3d4f04 100644 --- a/src/mds/RecoveryQueue.cc +++ b/src/mds/RecoveryQueue.cc @@ -194,8 +194,8 @@ void RecoveryQueue::_recovered(CInode *in, int r, uint64_t size, utime_t mtime) // of per-inode damage, but it's actually more likely that // this indicates something wrong with the MDS (like maybe // it has the wrong auth caps?) - mds->clog->error() << " OSD read error while recovering size for inode 0x" - << std::hex << in->ino() << std::dec; + mds->clog->error() << " OSD read error while recovering size" + " for inode " << in->ino(); mds->damaged(); } } diff --git a/src/mds/journal.cc b/src/mds/journal.cc index 5efb3fe3d6563..ab948648ce29d 100644 --- a/src/mds/journal.cc +++ b/src/mds/journal.cc @@ -600,8 +600,7 @@ void EMetaBlob::fullbit::update_inode(MDSRank *mds, CInode *in) dout(0) << "EMetaBlob.replay invalid layout on ino " << *in << ": " << in->inode.layout << dendl; std::ostringstream oss; - oss << "Invalid layout for inode 0x" << std::hex << in->inode.ino - << std::dec << " in journal"; + oss << "Invalid layout for inode " << in->ino() << " in journal"; mds->clog->error() << oss.str(); mds->damaged(); ceph_abort(); // Should be unreachable because damaged() calls respawn() -- 2.39.5