From f5fd7f19f386ebb0328a893bb16ffd5f559952b4 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 27 Sep 2011 21:42:35 -0700 Subject: [PATCH] mdsN -> mds.N Signed-off-by: Sage Weil --- src/ceph_mds.cc | 8 +-- src/client/Client.cc | 88 +++++++++++++-------------- src/mds/AnchorClient.cc | 2 +- src/mds/AnchorServer.cc | 2 +- src/mds/CDentry.cc | 4 +- src/mds/CDir.cc | 4 +- src/mds/CInode.cc | 4 +- src/mds/InoTable.cc | 2 +- src/mds/Locker.cc | 20 +++---- src/mds/MDBalancer.cc | 28 ++++----- src/mds/MDCache.cc | 90 ++++++++++++++-------------- src/mds/MDLog.cc | 2 +- src/mds/MDS.cc | 14 ++--- src/mds/MDSMap.cc | 2 +- src/mds/MDSTable.cc | 2 +- src/mds/MDSTableClient.cc | 6 +- src/mds/MDSTableServer.cc | 4 +- src/mds/Migrator.cc | 26 ++++---- src/mds/Mutation.cc | 2 +- src/mds/Server.cc | 26 ++++---- src/mds/SessionMap.cc | 2 +- src/mds/SnapServer.cc | 2 +- src/mds/events/ESlaveUpdate.h | 2 +- src/mds/events/ETableServer.h | 2 +- src/mds/journal.cc | 12 ++-- src/mds/snap.cc | 2 +- src/messages/MClientRequestForward.h | 2 +- src/mon/MDSMonitor.cc | 32 +++++----- 28 files changed, 196 insertions(+), 196 deletions(-) diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc index 243ca0e619e60..35150db24c0f8 100644 --- a/src/ceph_mds.cc +++ b/src/ceph_mds.cc @@ -69,14 +69,14 @@ static int do_cmds_special_action(const std::string &action, return -1; if (action == "dump-journal") { - dout(0) << "dumping journal for mds" << rank << " to " << dump_file << dendl; + dout(0) << "dumping journal for mds." << rank << " to " << dump_file << dendl; Dumper *journal_dumper = new Dumper(messenger, &mc); journal_dumper->init(rank); journal_dumper->dump(dump_file.c_str()); mc.shutdown(); } else if (action == "undump-journal") { - dout(0) << "undumping journal for mds" << rank << " from " << dump_file << dendl; + dout(0) << "undumping journal for mds." << rank << " from " << dump_file << dendl; Dumper *journal_dumper = new Dumper(messenger, &mc); journal_dumper->init(rank); journal_dumper->undump(dump_file.c_str()); @@ -168,7 +168,7 @@ int main(int argc, const char **argv) dout(0) << "Error: can only select one standby state" << dendl; return -1; } - dout(0) << "requesting oneshot_replay for mds" << r << dendl; + dout(0) << "requesting oneshot_replay for mds." << r << dendl; shadow = MDSMap::STATE_ONESHOT_REPLAY; char rb[32]; snprintf(rb, sizeof(rb), "%d", r); @@ -181,7 +181,7 @@ int main(int argc, const char **argv) dout(0) << "Error: can only select one standby state" << dendl; return -1; } - dout(0) << "requesting standby_replay for mds" << r << dendl; + dout(0) << "requesting standby_replay for mds." << r << dendl; shadow = MDSMap::STATE_STANDBY_REPLAY; char rb[32]; snprintf(rb, sizeof(rb), "%d", r); diff --git a/src/client/Client.cc b/src/client/Client.cc index 464714ee32aa9..836924b883ab7 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -675,7 +675,7 @@ Inode* Client::insert_trace(MetaRequest *request, int mds) { MClientReply *reply = request->reply; - ldout(cct, 10) << "insert_trace from " << request->sent_stamp << " mds" << mds + ldout(cct, 10) << "insert_trace from " << request->sent_stamp << " mds." << mds << " is_target=" << (int)reply->head.is_target << " is_dentry=" << (int)reply->head.is_dentry << dendl; @@ -891,7 +891,7 @@ int Client::choose_target_mds(MetaRequest *req) if (req->resend_mds >= 0) { mds = req->resend_mds; req->resend_mds = -1; - ldout(cct, 10) << "choose_target_mds resend_mds specified as mds" << mds << dendl; + ldout(cct, 10) << "choose_target_mds resend_mds specified as mds." << mds << dendl; goto out; } @@ -984,15 +984,15 @@ out: void Client::connect_mds_targets(int mds) { //this function shouldn't be called unless we lost a connection - ldout(cct, 10) << "connect_mds_targets for mds" << mds << dendl; + ldout(cct, 10) << "connect_mds_targets for mds." << mds << dendl; assert(mds_sessions.count(mds)); const MDSMap::mds_info_t& info = mdsmap->get_mds_info(mds); for (set::const_iterator q = info.export_targets.begin(); q != info.export_targets.end(); q++) { if (mds_sessions.count(*q) == 0 && waiting_for_session.count(mds) == 0) { - ldout(cct, 10) << "check_mds_sessions opening mds" << mds - << " export target mds" << *q << dendl; + ldout(cct, 10) << "check_mds_sessions opening mds." << mds + << " export target mds." << *q << dendl; messenger->send_message(new MClientSession(CEPH_SESSION_REQUEST_OPEN), mdsmap->get_inst(*q)); waiting_for_session[*q].size(); @@ -1036,7 +1036,7 @@ int Client::make_request(MetaRequest *request, int mds = choose_target_mds(request); if (mds < 0 || !mdsmap->is_active(mds)) { Cond cond; - ldout(cct, 10) << " target mds" << mds << " not active, waiting for new mdsmap" << dendl; + ldout(cct, 10) << " target mds." << mds << " not active, waiting for new mdsmap" << dendl; waiting_for_mdsmap.push_back(&cond); cond.Wait(client_lock); continue; @@ -1047,19 +1047,19 @@ int Client::make_request(MetaRequest *request, Cond cond; if (!mdsmap->is_active(mds)) { - ldout(cct, 10) << "no address for mds" << mds << ", waiting for new mdsmap" << dendl; + ldout(cct, 10) << "no address for mds." << mds << ", waiting for new mdsmap" << dendl; waiting_for_mdsmap.push_back(&cond); cond.Wait(client_lock); if (!mdsmap->is_active(mds)) { - ldout(cct, 10) << "hmm, still have no address for mds" << mds << ", trying a random mds" << dendl; + ldout(cct, 10) << "hmm, still have no address for mds." << mds << ", trying a random mds" << dendl; request->resend_mds = mdsmap->get_random_up_mds(); continue; } } if (waiting_for_session.count(mds) == 0) { - ldout(cct, 10) << "opening session to mds" << mds << dendl; + ldout(cct, 10) << "opening session to mds." << mds << dendl; messenger->send_message(new MClientSession(CEPH_SESSION_REQUEST_OPEN), mdsmap->get_inst(mds)); } @@ -1067,7 +1067,7 @@ int Client::make_request(MetaRequest *request, // wait waiting_for_session[mds].push_back(&cond); while (waiting_for_session.count(mds)) { - ldout(cct, 10) << "waiting for session to mds" << mds << " to open" << dendl; + ldout(cct, 10) << "waiting for session to mds." << mds << " to open" << dendl; cond.Wait(client_lock); } } @@ -1279,7 +1279,7 @@ void Client::send_request(MetaRequest *request, int mds) { // make the request ldout(cct, 10) << "send_request rebuilding request " << request->get_tid() - << " for mds" << mds << dendl; + << " for mds." << mds << dendl; MClientRequest *r = build_client_request(request); if (request->dentry) r->set_dentry_wanted(); @@ -1301,7 +1301,7 @@ void Client::send_request(MetaRequest *request, int mds) mds_sessions[mds]->requests.push_back(&request->item); - ldout(cct, 10) << "send_request " << *r << " to mds" << mds << dendl; + ldout(cct, 10) << "send_request " << *r << " to mds." << mds << dendl; messenger->send_message(r, mdsmap->get_inst(mds)); } @@ -1359,7 +1359,7 @@ void Client::handle_client_request_forward(MClientRequestForward *fwd) // resend. ldout(cct, 10) << "handle_client_request tid " << tid << " fwd " << fwd->get_num_fwd() - << " to mds" << fwd->get_dest_mds() + << " to mds." << fwd->get_dest_mds() << ", resending to " << fwd->get_dest_mds() << dendl; @@ -1401,7 +1401,7 @@ void Client::handle_client_reply(MClientReply *reply) if (-ESTALE == reply->get_result()) { // see if we can get to proper MDS request->send_to_auth = true; ldout(cct, 20) << "got ESTALE on tid " << request->tid - << " from mds" << request->mds << dendl; + << " from mds." << request->mds << dendl; request->resend_mds = choose_target_mds(request); if (request->resend_mds >= 0 && request->resend_mds != request->mds) { // wasn't sent to auth, resend @@ -1585,7 +1585,7 @@ void Client::handle_mds_map(MMDSMap* m) void Client::send_reconnect(int mds) { - ldout(cct, 10) << "send_reconnect to mds" << mds << dendl; + ldout(cct, 10) << "send_reconnect to mds." << mds << dendl; MClientReconnect *m = new MClientReconnect; @@ -1649,7 +1649,7 @@ void Client::send_reconnect(int mds) void Client::kick_requests(int mds, bool signal) { - ldout(cct, 10) << "kick_requests for mds" << mds << dendl; + ldout(cct, 10) << "kick_requests for mds." << mds << dendl; for (map::iterator p = mds_requests.begin(); p != mds_requests.end(); @@ -1686,7 +1686,7 @@ void Client::got_mds_push(int mds) MetaSession *s = mds_sessions[mds]; s->seq++; - ldout(cct, 10) << " mds" << mds << " seq now " << s->seq << dendl; + ldout(cct, 10) << " mds." << mds << " seq now " << s->seq << dendl; if (s->closing) messenger->send_message(new MClientSession(CEPH_SESSION_REQUEST_CLOSE, s->seq), s->inst); @@ -1737,7 +1737,7 @@ void Client::release_lease(Inode *in, Dentry *dn, int mask) // dentry? if (dn->lease_mds >= 0 && now < dn->lease_ttl && mdsmap->is_up(dn->lease_mds)) { - ldout(cct, 10) << "release_lease mds" << dn->lease_mds << " mask " << mask + ldout(cct, 10) << "release_lease mds." << dn->lease_mds << " mask " << mask << " on " << in->ino << " " << dn->name << dendl; messenger->send_message(new MClientLease(CEPH_MDS_LEASE_RELEASE, dn->lease_seq, CEPH_LOCK_DN, @@ -1964,7 +1964,7 @@ void Client::send_cap(Inode *in, int mds, Cap *cap, int used, int want, int reta int op = CEPH_CAP_OP_UPDATE; ldout(cct, 10) << "send_cap " << *in - << " mds" << mds << " seq " << cap->seq + << " mds." << mds << " seq " << cap->seq << " used " << ccap_string(used) << " want " << ccap_string(want) << " flush " << ccap_string(flush) @@ -2079,7 +2079,7 @@ void Client::check_caps(Inode *in, bool is_delayed) int revoking = cap->implemented & ~cap->issued; - ldout(cct, 10) << " cap mds" << mds + ldout(cct, 10) << " cap mds." << mds << " issued " << ccap_string(cap->issued) << " implemented " << ccap_string(cap->implemented) << " revoking " << ccap_string(revoking) << dendl; @@ -2229,7 +2229,7 @@ void Client::flush_snaps(Inode *in, bool all_again, CapSnap *again) continue; } - ldout(cct, 10) << "flush_snaps mds" << mds + ldout(cct, 10) << "flush_snaps mds." << mds << " follows " << p->first << " size " << capsnap->size << " mtime " << capsnap->mtime @@ -2460,7 +2460,7 @@ void Client::add_update_cap(Inode *in, int mds, uint64_t cap_id, cap->issue_seq = seq; cap->mseq = mseq; ldout(cct, 10) << "add_update_cap issued " << ccap_string(old_caps) << " -> " << ccap_string(cap->issued) - << " from mds" << mds + << " from mds." << mds << " on " << *in << dendl; @@ -2474,7 +2474,7 @@ void Client::remove_cap(Cap *cap) MetaSession *session = cap->session; int mds = cap->session->mds_num; - ldout(cct, 10) << "remove_cap mds" << mds << " on " << *in << dendl; + ldout(cct, 10) << "remove_cap mds." << mds << " on " << *in << dendl; if (!session->release) session->release = new MClientCapRelease; @@ -2521,7 +2521,7 @@ void Client::remove_session_caps(MetaSession *mds) void Client::trim_caps(int mds, int max) { - ldout(cct, 10) << "trim_caps mds" << mds << " max " << max << dendl; + ldout(cct, 10) << "trim_caps mds." << mds << " max " << max << dendl; MetaSession *s = mds_sessions[mds]; int trimmed = 0; @@ -2612,7 +2612,7 @@ void Client::flush_caps() void Client::flush_caps(Inode *in, int mds) { - ldout(cct, 10) << "flush_caps " << in << " mds" << mds << dendl; + ldout(cct, 10) << "flush_caps " << in << " mds." << mds << dendl; Cap *cap = in->auth_cap; assert(cap->session->mds_num == mds); @@ -2634,7 +2634,7 @@ void Client::wait_sync_caps(uint64_t want) continue; Inode *in = p->second->flushing_caps.front(); if (in->flushing_cap_seq <= want) { - ldout(cct, 10) << " waiting on mds" << p->first << " tid " << in->flushing_cap_seq + ldout(cct, 10) << " waiting on mds." << p->first << " tid " << in->flushing_cap_seq << " (want " << want << ")" << dendl; sync_cond.Wait(client_lock); goto retry; @@ -2651,12 +2651,12 @@ void Client::kick_flushing_caps(int mds) CapSnap *capsnap = *p; Inode *in = capsnap->in; ldout(cct, 20) << " reflushing capsnap " << capsnap - << " on " << *in << " to mds" << mds << dendl; + << " on " << *in << " to mds." << mds << dendl; flush_snaps(in, false, capsnap); } for (xlist::iterator p = session->flushing_caps.begin(); !p.end(); ++p) { Inode *in = *p; - ldout(cct, 20) << " reflushing caps on " << *in << " to mds" << mds << dendl; + ldout(cct, 20) << " reflushing caps on " << *in << " to mds." << mds << dendl; if (in->flushing_caps) flush_caps(in, mds); } @@ -2934,7 +2934,7 @@ void Client::handle_caps(MClientCaps *m) } if (in->caps.count(mds) == 0) { - ldout(cct, 5) << "handle_caps don't have " << *in << " cap on mds" << mds << dendl; + ldout(cct, 5) << "handle_caps don't have " << *in << " cap on mds." << mds << dendl; m->put(); return; } @@ -2971,7 +2971,7 @@ void Client::handle_cap_import(Inode *in, MClientCaps *m) if (m->get_mseq() > in->exporting_mseq) { ldout(cct, 5) << "handle_cap_import ino " << m->get_ino() << " mseq " << m->get_mseq() - << " IMPORT from mds" << mds + << " IMPORT from mds." << mds << ", clearing exporting_issued " << ccap_string(in->exporting_issued) << " mseq " << in->exporting_mseq << dendl; in->exporting_issued = 0; @@ -2979,9 +2979,9 @@ void Client::handle_cap_import(Inode *in, MClientCaps *m) in->exporting_mds = -1; } else { ldout(cct, 5) << "handle_cap_import ino " << m->get_ino() << " mseq " << m->get_mseq() - << " IMPORT from mds" << mds + << " IMPORT from mds." << mds << ", keeping exporting_issued " << ccap_string(in->exporting_issued) - << " mseq " << in->exporting_mseq << " by mds" << in->exporting_mds << dendl; + << " mseq " << in->exporting_mseq << " by mds." << in->exporting_mds << dendl; } m->put(); } @@ -3001,22 +3001,22 @@ void Client::handle_cap_export(Inode *in, MClientCaps *m) if (p->second->mseq > m->get_mseq()) { found_higher_mseq = true; ldout(cct, 5) << "handle_cap_export ino " << m->get_ino() << " mseq " << m->get_mseq() - << " EXPORT from mds" << mds - << ", but mds" << p->first << " has higher mseq " << p->second->mseq << dendl; + << " EXPORT from mds." << mds + << ", but mds." << p->first << " has higher mseq " << p->second->mseq << dendl; } } if (cap) { if (!found_higher_mseq) { ldout(cct, 5) << "handle_cap_export ino " << m->get_ino() << " mseq " << m->get_mseq() - << " EXPORT from mds" << mds + << " EXPORT from mds." << mds << ", setting exporting_issued " << ccap_string(cap->issued) << dendl; in->exporting_issued = cap->issued; in->exporting_mseq = m->get_mseq(); in->exporting_mds = mds; } else ldout(cct, 5) << "handle_cap_export ino " << m->get_ino() << " mseq " << m->get_mseq() - << " EXPORT from mds" << mds + << " EXPORT from mds." << mds << ", just removing old cap" << dendl; remove_cap(cap); @@ -3059,7 +3059,7 @@ void Client::handle_cap_flush_ack(Inode *in, int mds, Cap *cap, MClientCaps *m) cleaned |= 1 << i; } - ldout(cct, 5) << "handle_cap_flush_ack mds" << mds + ldout(cct, 5) << "handle_cap_flush_ack mds." << mds << " cleaned " << ccap_string(cleaned) << " on " << *in << " with " << ccap_string(dirty) << dendl; @@ -3097,7 +3097,7 @@ void Client::handle_cap_flushsnap_ack(Inode *in, MClientCaps *m) if (m->get_client_tid() != capsnap->flush_tid) { ldout(cct, 10) << " tid " << m->get_client_tid() << " != " << capsnap->flush_tid << dendl; } else { - ldout(cct, 5) << "handle_cap_flushedsnap mds" << mds << " flushed snap follows " << follows + ldout(cct, 5) << "handle_cap_flushedsnap mds." << mds << " flushed snap follows " << follows << " on " << *in << dendl; capsnap->flushing_item.remove_myself(); delete capsnap; @@ -3105,7 +3105,7 @@ void Client::handle_cap_flushsnap_ack(Inode *in, MClientCaps *m) put_inode(in); } } else { - ldout(cct, 5) << "handle_cap_flushedsnap DUP(?) mds" << mds << " flushed snap follows " << follows + ldout(cct, 5) << "handle_cap_flushedsnap DUP(?) mds." << mds << " flushed snap follows " << follows << " on " << *in << dendl; // we may not have it if we send multiple FLUSHSNAP requests and (got multiple FLUSHEDSNAPs back) } @@ -3121,7 +3121,7 @@ void Client::handle_cap_grant(Inode *in, int mds, Cap *cap, MClientCaps *m) const int old_caps = cap->issued; const int new_caps = m->get_caps(); ldout(cct, 5) << "handle_cap_grant on in " << m->get_ino() - << " mds" << mds << " seq " << m->get_seq() + << " mds." << mds << " seq " << m->get_seq() << " caps now " << ccap_string(new_caps) << " was " << ccap_string(old_caps) << dendl; @@ -3372,7 +3372,7 @@ void Client::unmount() for (map::iterator p = mds_sessions.begin(); p != mds_sessions.end(); ++p) { - ldout(cct, 2) << "sending client_session close to mds" << p->first + ldout(cct, 2) << "sending client_session close to mds." << p->first << " seq " << p->second->seq << dendl; if (!p->second->closing) { p->second->closing = true; @@ -3457,14 +3457,14 @@ void Client::renew_caps() for (map::iterator p = mds_sessions.begin(); p != mds_sessions.end(); p++) { - ldout(cct, 15) << "renew_caps requesting from mds" << p->first << dendl; + ldout(cct, 15) << "renew_caps requesting from mds." << p->first << dendl; if (mdsmap->get_state(p->first) >= MDSMap::STATE_REJOIN) renew_caps(p->first); } } void Client::renew_caps(const int mds) { - ldout(cct, 10) << "renew_caps mds" << mds << dendl; + ldout(cct, 10) << "renew_caps mds." << mds << dendl; MetaSession *session = mds_sessions[mds]; session->last_cap_renew_request = ceph_clock_now(cct); uint64_t seq = ++session->cap_renew_seq; @@ -3531,7 +3531,7 @@ int Client::_lookup(Inode *dir, const string& dname, Inode **target) dir->dir->dentries.count(dname)) { Dentry *dn = dir->dir->dentries[dname]; - ldout(cct, 20) << "_lookup have dn " << dname << " mds" << dn->lease_mds << " ttl " << dn->lease_ttl + ldout(cct, 20) << "_lookup have dn " << dname << " mds." << dn->lease_mds << " ttl " << dn->lease_ttl << " seq " << dn->lease_seq << dendl; diff --git a/src/mds/AnchorClient.cc b/src/mds/AnchorClient.cc index db237db95a97b..3dad48f1f26ec 100644 --- a/src/mds/AnchorClient.cc +++ b/src/mds/AnchorClient.cc @@ -24,7 +24,7 @@ #define DOUT_SUBSYS mds #undef dout_prefix -#define dout_prefix *_dout << "mds" << mds->get_nodeid() << ".anchorclient " +#define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".anchorclient " diff --git a/src/mds/AnchorServer.cc b/src/mds/AnchorServer.cc index c430f2c3ae380..423a760608be4 100644 --- a/src/mds/AnchorServer.cc +++ b/src/mds/AnchorServer.cc @@ -19,7 +19,7 @@ #define DOUT_SUBSYS mds #undef dout_prefix -#define dout_prefix *_dout << "mds" << mds->get_nodeid() << ".anchorserver " +#define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".anchorserver " // table diff --git a/src/mds/CDentry.cc b/src/mds/CDentry.cc index aa55c11c7d95a..e1a8948024142 100644 --- a/src/mds/CDentry.cc +++ b/src/mds/CDentry.cc @@ -28,12 +28,12 @@ #define DOUT_SUBSYS mds #undef dout_prefix -#define dout_prefix *_dout << "mds" << dir->cache->mds->get_nodeid() << ".cache.den(" << dir->dirfrag() << " " << name << ") " +#define dout_prefix *_dout << "mds." << dir->cache->mds->get_nodeid() << ".cache.den(" << dir->dirfrag() << " " << name << ") " ostream& CDentry::print_db_line_prefix(ostream& out) { - return out << ceph_clock_now(g_ceph_context) << " mds" << dir->cache->mds->get_nodeid() << ".cache.den(" << dir->ino() << " " << name << ") "; + return out << ceph_clock_now(g_ceph_context) << " mds." << dir->cache->mds->get_nodeid() << ".cache.den(" << dir->ino() << " " << name << ") "; } boost::pool<> CDentry::pool(sizeof(CDentry)); diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc index 73cf929a9f1e6..5a243bb3bb15c 100644 --- a/src/mds/CDir.cc +++ b/src/mds/CDir.cc @@ -37,7 +37,7 @@ #define DOUT_SUBSYS mds #undef dout_prefix -#define dout_prefix *_dout << "mds" << cache->mds->get_nodeid() << ".cache.dir(" << this->dirfrag() << ") " +#define dout_prefix *_dout << "mds." << cache->mds->get_nodeid() << ".cache.dir(" << this->dirfrag() << ") " @@ -144,7 +144,7 @@ void CDir::print(ostream& out) ostream& CDir::print_db_line_prefix(ostream& out) { - return out << ceph_clock_now(g_ceph_context) << " mds" << cache->mds->get_nodeid() << ".cache.dir(" << this->dirfrag() << ") "; + return out << ceph_clock_now(g_ceph_context) << " mds." << cache->mds->get_nodeid() << ".cache.dir(" << this->dirfrag() << ") "; } diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc index 9775fa728be65..90cd06ea72e08 100644 --- a/src/mds/CInode.cc +++ b/src/mds/CInode.cc @@ -44,7 +44,7 @@ #define DOUT_SUBSYS mds #undef dout_prefix -#define dout_prefix *_dout << "mds" << mdcache->mds->get_nodeid() << ".cache.ino(" << inode.ino << ") " +#define dout_prefix *_dout << "mds." << mdcache->mds->get_nodeid() << ".cache.ino(" << inode.ino << ") " boost::pool<> CInode::pool(sizeof(CInode)); @@ -64,7 +64,7 @@ LockType CInode::policylock_type(CEPH_LOCK_IPOLICY); //int cinode_pins[CINODE_NUM_PINS]; // counts ostream& CInode::print_db_line_prefix(ostream& out) { - return out << ceph_clock_now(g_ceph_context) << " mds" << mdcache->mds->get_nodeid() << ".cache.ino(" << inode.ino << ") "; + return out << ceph_clock_now(g_ceph_context) << " mds." << mdcache->mds->get_nodeid() << ".cache.ino(" << inode.ino << ") "; } /* diff --git a/src/mds/InoTable.cc b/src/mds/InoTable.cc index a20f3cf5c9e02..a51db89e137b2 100644 --- a/src/mds/InoTable.cc +++ b/src/mds/InoTable.cc @@ -21,7 +21,7 @@ #define DOUT_SUBSYS mds #undef dout_prefix -#define dout_prefix *_dout << "mds" << mds->get_nodeid() << "." << table_name << ": " +#define dout_prefix *_dout << "mds." << mds->get_nodeid() << "." << table_name << ": " void InoTable::reset_state() { diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index ca380e593d5ba..797d48c9529e4 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -62,7 +62,7 @@ #define DOUT_COND(cct, l) l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_locker #define dout_prefix _prefix(_dout, mds) static ostream& _prefix(std::ostream *_dout, MDS *mds) { - return *_dout << "mds" << mds->get_nodeid() << ".locker "; + return *_dout << "mds." << mds->get_nodeid() << ".locker "; } /* This function DOES put the passed message before returning */ @@ -243,7 +243,7 @@ bool Locker::acquire_locks(MDRequest *mdr, // remote_wrlocks if (remote_wrlocks) { for (map::iterator p = remote_wrlocks->begin(); p != remote_wrlocks->end(); ++p) { - dout(20) << " must remote_wrlock on mds" << p->second << " " + dout(20) << " must remote_wrlock on mds." << p->second << " " << *p->first << " " << *(p->first)->get_parent() << dendl; sorted.insert(p->first); mustpin.insert(p->first); @@ -321,7 +321,7 @@ bool Locker::acquire_locks(MDRequest *mdr, for (map >::iterator p = mustpin_remote.begin(); p != mustpin_remote.end(); ++p) { - dout(10) << "requesting remote auth_pins from mds" << p->first << dendl; + dout(10) << "requesting remote auth_pins from mds." << p->first << dendl; MMDSSlaveRequest *req = new MMDSSlaveRequest(mdr->reqid, mdr->attempt, MMDSSlaveRequest::OP_AUTHPIN); @@ -373,8 +373,8 @@ bool Locker::acquire_locks(MDRequest *mdr, dout(10) << " already remote_wrlocked " << *have << " " << *have->get_parent() << dendl; continue; } - dout(10) << " unlocking remote_wrlock on wrong mds" << mdr->remote_wrlocks[have] - << " (want mds" << (*remote_wrlocks)[have] << ") " + dout(10) << " unlocking remote_wrlock on wrong mds." << mdr->remote_wrlocks[have] + << " (want mds." << (*remote_wrlocks)[have] << ") " << *have << " " << *have->get_parent() << dendl; remote_wrlock_finish(have, mdr->remote_wrlocks[have], mdr); // continue... @@ -1267,7 +1267,7 @@ void Locker::wrlock_finish(SimpleLock *lock, Mutation *mut, bool *pneed_issue) void Locker::remote_wrlock_start(SimpleLock *lock, int target, MDRequest *mut) { - dout(7) << "remote_wrlock_start mds" << target << " on " << *lock << " on " << *lock->get_parent() << dendl; + dout(7) << "remote_wrlock_start mds." << target << " on " << *lock << " on " << *lock->get_parent() << dendl; // wait for single auth if (lock->get_parent()->is_ambiguous_auth()) { @@ -1294,7 +1294,7 @@ void Locker::remote_wrlock_finish(SimpleLock *lock, int target, Mutation *mut) mut->remote_wrlocks.erase(lock); mut->locks.erase(lock); - dout(7) << "remote_wrlock_finish releasing remote wrlock on mds" << target + dout(7) << "remote_wrlock_finish releasing remote wrlock on mds." << target << " " << *lock->get_parent() << dendl; if (mds->mdsmap->get_state(target) >= MDSMap::STATE_REJOIN) { MMDSSlaveRequest *slavereq = new MMDSSlaveRequest(mut->reqid, mut->attempt, @@ -1848,7 +1848,7 @@ void Locker::request_inode_file_caps(CInode *in) int auth = in->authority().first; dout(7) << "request_inode_file_caps " << ccap_string(wanted) << " was " << ccap_string(in->replica_caps_wanted) - << " on " << *in << " to mds" << auth << dendl; + << " on " << *in << " to mds." << auth << dendl; in->replica_caps_wanted = wanted; @@ -1879,7 +1879,7 @@ void Locker::handle_inode_file_caps(MInodeFileCaps *m) } - dout(7) << "handle_inode_file_caps replica mds" << from << " wants caps " << ccap_string(m->get_caps()) << " on " << *in << dendl; + dout(7) << "handle_inode_file_caps replica mds." << from << " wants caps " << ccap_string(m->get_caps()) << " on " << *in << dendl; if (m->get_caps()) in->mds_caps_wanted[from] = m->get_caps(); @@ -4298,7 +4298,7 @@ void Locker::handle_file_lock(ScatterLock *lock, MLock *m) dout(7) << "handle_file_lock a=" << get_lock_action_name(m->get_action()) << " on " << *lock - << " from mds" << from << " " + << " from mds." << from << " " << *in << dendl; bool caps = lock->get_cap_shift(); diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc index 720b39b89f643..eb8fb7530311d 100644 --- a/src/mds/MDBalancer.cc +++ b/src/mds/MDBalancer.cc @@ -41,7 +41,7 @@ using std::vector; #undef DOUT_COND #define DOUT_COND(cct, l) l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_balancer #undef dout_prefix -#define dout_prefix *_dout << "mds" << mds->get_nodeid() << ".bal " +#define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".bal " #define MIN_LOAD 50 // ?? #define MIN_REEXPORT 5 // will automatically reexport @@ -211,7 +211,7 @@ void MDBalancer::send_heartbeat() mds_import_map[ mds->get_nodeid() ] = import_map; - dout(5) << "mds" << mds->get_nodeid() << " epoch " << beat_epoch << " load " << load << dendl; + dout(5) << "mds." << mds->get_nodeid() << " epoch " << beat_epoch << " load " << load << dendl; for (map::iterator it = import_map.begin(); it != import_map.end(); it++) { @@ -319,7 +319,7 @@ double MDBalancer::try_match(int ex, double& maxex, double howmuch = MIN(maxex, maxim); if (howmuch <= 0) return 0.0; - dout(5) << " - mds" << ex << " exports " << howmuch << " to mds" << im << dendl; + dout(5) << " - mds." << ex << " exports " << howmuch << " to mds." << im << dendl; if (ex == mds->get_nodeid()) my_targets[im] += howmuch; @@ -472,7 +472,7 @@ void MDBalancer::prep_rebalance(int beat) mds_meta_load[i] = l; if (whoami == 0) - dout(0) << " mds" << i + dout(0) << " mds." << i << " " << load << " = " << load.mds_load() << " ~ " << l << dendl; @@ -519,11 +519,11 @@ void MDBalancer::prep_rebalance(int beat) it != load_map.end(); it++) { if (it->first < target_load) { - dout(15) << " mds" << it->second << " is importer" << dendl; + dout(15) << " mds." << it->second << " is importer" << dendl; importers.insert(pair(it->first,it->second)); importer_set.insert(it->second); } else { - dout(15) << " mds" << it->second << " is exporter" << dendl; + dout(15) << " mds." << it->second << " is exporter" << dendl; exporters.insert(pair(it->first,it->second)); exporter_set.insert(it->second); } @@ -628,7 +628,7 @@ void MDBalancer::try_rebalance() im->inode != mds->mdcache->get_root() && im->inode->authority().first != mds->get_nodeid()) { dout(0) << " exporting idle (" << pop << ") import " << *im - << " back to mds" << im->inode->authority().first + << " back to mds." << im->inode->authority().first << dendl; mds->mdcache->migrator->export_dir_nicely(im, im->inode->authority().first); continue; @@ -668,7 +668,7 @@ void MDBalancer::try_rebalance() if (amount < MIN_OFFLOAD) continue; if (amount / target_load < .2) continue; - dout(5) << "want to send " << amount << " to mds" << target + dout(5) << "want to send " << amount << " to mds." << target //<< " .. " << (*it).second << " * " << load_fac << " -> " << amount << dendl;//" .. fudge is " << fudge << dendl; @@ -679,7 +679,7 @@ void MDBalancer::try_rebalance() // search imports from target if (import_from_map.count(target)) { - dout(5) << " aha, looking through imports from target mds" << target << dendl; + dout(5) << " aha, looking through imports from target mds." << target << dendl; pair::iterator, multimap::iterator> p = import_from_map.equal_range(target); while (p.first != p.second) { @@ -697,7 +697,7 @@ void MDBalancer::try_rebalance() if (pop <= amount-have) { dout(0) << "reexporting " << *dir << " pop " << pop - << " back to mds" << target << dendl; + << " back to mds." << target << dendl; mds->mdcache->migrator->export_dir_nicely(dir, target); have += pop; import_from_map.erase(plast); @@ -727,7 +727,7 @@ void MDBalancer::try_rebalance() if (pop < amount-have || pop < MIN_REEXPORT) { dout(0) << "reexporting " << *imp << " pop " << pop - << " back to mds" << imp->inode->authority() + << " back to mds." << imp->inode->authority() << dendl; have += pop; mds->mdcache->migrator->export_dir_nicely(imp, imp->inode->authority().first); @@ -762,7 +762,7 @@ void MDBalancer::try_rebalance() << (*it)->pop_auth_subtree << " " << (*it)->pop_auth_subtree.meta_load(rebalance_time, mds->mdcache->decayrate) - << " to mds" << target + << " to mds." << target << " " << **it << dendl; mds->mdcache->migrator->export_dir_nicely(*it, target); @@ -801,7 +801,7 @@ bool MDBalancer::check_targets() old_prev_targets[i->first] = 0; if (!map_targets.count(i->first)) { - dout(20) << " target mds" << i->first << " not in map's export_targets" << dendl; + dout(20) << " target mds." << i->first << " not in map's export_targets" << dendl; send = true; ok = false; } @@ -815,7 +815,7 @@ bool MDBalancer::check_targets() old_prev_targets.erase(p++); continue; } - dout(20) << " target mds" << p->first << " has been non-target for " << p->second << dendl; + dout(20) << " target mds." << p->first << " has been non-target for " << p->second << dendl; if (p->second < g_conf->mds_bal_target_removal_min) want_targets.insert(p->first); if (p->second >= g_conf->mds_bal_target_removal_max) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 2844882153cb5..4d86eb44a8d23 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -102,7 +102,7 @@ extern struct ceph_file_layout g_default_file_layout; #undef dout_prefix #define dout_prefix _prefix(_dout, mds) static ostream& _prefix(std::ostream *_dout, MDS *mds) { - return *_dout << "mds" << mds->get_nodeid() << ".cache "; + return *_dout << "mds." << mds->get_nodeid() << ".cache "; } long g_num_ino = 0; @@ -2157,7 +2157,7 @@ void MDCache::_logged_master_commit(metareqid_t reqid, LogSegment *ls, listfirst << dendl; m->add_slave_request(p->first); } - dout(10) << " will need resolve ack from mds" << who << dendl; + dout(10) << " will need resolve ack from mds." << who << dendl; need_resolve_ack.insert(who); } @@ -2534,12 +2534,12 @@ void MDCache::send_resolve_now(int who) void MDCache::handle_mds_failure(int who) { - dout(7) << "handle_mds_failure mds" << who << dendl; + dout(7) << "handle_mds_failure mds." << who << dendl; // make note of recovery set mds->mdsmap->get_recovery_mds_set(recovery_set); recovery_set.erase(mds->get_nodeid()); - dout(1) << "handle_mds_failure mds" << who << " : recovery peers are " << recovery_set << dendl; + dout(1) << "handle_mds_failure mds." << who << " : recovery peers are " << recovery_set << dendl; // adjust my recovery lists wants_resolve.erase(who); // MDS will ask again @@ -2579,14 +2579,14 @@ void MDCache::handle_mds_failure(int who) // failed node is slave? if (!p->second->committing) { if (p->second->more()->witnessed.count(who)) { - dout(10) << " master request " << *p->second << " no longer witnessed by slave mds" << who + dout(10) << " master request " << *p->second << " no longer witnessed by slave mds." << who << dendl; // discard this peer's prepare (if any) p->second->more()->witnessed.erase(who); } if (p->second->more()->waiting_on_slave.count(who)) { - dout(10) << " master request " << *p->second << " waiting for slave mds" << who + dout(10) << " master request " << *p->second << " waiting for slave mds." << who << " to recover" << dendl; // retry request when peer recovers p->second->more()->waiting_on_slave.erase(who); @@ -2612,7 +2612,7 @@ void MDCache::handle_mds_failure(int who) */ void MDCache::handle_mds_recovery(int who) { - dout(7) << "handle_mds_recovery mds" << who << dendl; + dout(7) << "handle_mds_recovery mds." << who << dendl; list waiters; @@ -2923,7 +2923,7 @@ void MDCache::disambiguate_imports() p != other_ambiguous_imports.end(); ++p) { int who = p->first; - dout(10) << "ambiguous imports for mds" << who << dendl; + dout(10) << "ambiguous imports for mds." << who << dendl; for (map >::iterator q = p->second.begin(); q != p->second.end(); @@ -2934,11 +2934,11 @@ void MDCache::disambiguate_imports() if (!dir) continue; if (dir->is_ambiguous_auth()) { // works for me_ambig or if i am a surviving bystander - dout(10) << " mds" << who << " did import " << *dir << dendl; + dout(10) << " mds." << who << " did import " << *dir << dendl; adjust_bounded_subtree_auth(dir, q->second, who); try_subtree_merge(dir); } else { - dout(10) << " mds" << who << " did not import " << *dir << dendl; + dout(10) << " mds." << who << " did not import " << *dir << dendl; } } } @@ -3862,7 +3862,7 @@ bool MDCache::parallel_fetch_traverse_dir(inodeno_t ino, filepath& path, */ void MDCache::rejoin_scour_survivor_replicas(int from, MMDSCacheRejoin *ack, set& acked_inodes) { - dout(10) << "rejoin_scour_survivor_replicas from mds" << from << dendl; + dout(10) << "rejoin_scour_survivor_replicas from mds." << from << dendl; // FIXME: what about root and stray inodes. @@ -4632,7 +4632,7 @@ void MDCache::clean_open_file_lists() void MDCache::rejoin_import_cap(CInode *in, client_t client, ceph_mds_cap_reconnect& icr, int frommds) { - dout(10) << "rejoin_import_cap for client" << client << " from mds" << frommds + dout(10) << "rejoin_import_cap for client" << client << " from mds." << frommds << " on " << *in << dendl; Session *session = mds->sessionmap.get_session(entity_name_t::CLIENT(client.v)); assert(session); @@ -5450,7 +5450,7 @@ void MDCache::trim_dentry(CDentry *dn, map& expiremap) con->is_importing()) break; // don't send any expire while importing. if (a == mds->get_nodeid()) continue; // on export, ignore myself. - dout(12) << " sending expire to mds" << a << " on " << *dn << dendl; + dout(12) << " sending expire to mds." << a << " on " << *dn << dendl; assert(a != mds->get_nodeid()); if (expiremap.count(a) == 0) expiremap[a] = new MCacheExpire(mds->get_nodeid()); @@ -5526,7 +5526,7 @@ void MDCache::trim_dirfrag(CDir *dir, CDir *con, map& expire con->is_importing()) break; // don't send any expire while importing. if (a == mds->get_nodeid()) continue; // on export, ignore myself. - dout(12) << " sending expire to mds" << a << " on " << *dir << dendl; + dout(12) << " sending expire to mds." << a << " on " << *dir << dendl; assert(a != mds->get_nodeid()); if (expiremap.count(a) == 0) expiremap[a] = new MCacheExpire(mds->get_nodeid()); @@ -5568,7 +5568,7 @@ void MDCache::trim_inode(CDentry *dn, CInode *in, CDir *con, mapis_importing()) break; // don't send any expire while importing. if (a == mds->get_nodeid()) continue; // on export, ignore myself. - dout(12) << " sending expire to mds" << a << " on " << *in << dendl; + dout(12) << " sending expire to mds." << a << " on " << *in << dendl; assert(a != mds->get_nodeid()); if (expiremap.count(a) == 0) expiremap[a] = new MCacheExpire(mds->get_nodeid()); @@ -5855,7 +5855,7 @@ void MDCache::handle_cache_expire(MCacheExpire *m) { int from = m->get_from(); - dout(7) << "cache_expire from mds" << from << dendl; + dout(7) << "cache_expire from mds." << from << dendl; if (mds->get_state() < MDSMap::STATE_REJOIN) { m->put(); @@ -5916,13 +5916,13 @@ void MDCache::handle_cache_expire(MCacheExpire *m) // check nonce if (nonce == in->get_replica_nonce(from)) { // remove from our cached_by - dout(7) << " inode expire on " << *in << " from mds" << from + dout(7) << " inode expire on " << *in << " from mds." << from << " cached_by was " << in->get_replicas() << dendl; inode_remove_replica(in, from); } else { // this is an old nonce, ignore expire. - dout(7) << " inode expire on " << *in << " from mds" << from + dout(7) << " inode expire on " << *in << " from mds." << from << " with old nonce " << nonce << " (current " << in->get_replica_nonce(from) << "), dropping" << dendl; @@ -5946,13 +5946,13 @@ void MDCache::handle_cache_expire(MCacheExpire *m) // check nonce if (nonce == dir->get_replica_nonce(from)) { // remove from our cached_by - dout(7) << " dir expire on " << *dir << " from mds" << from + dout(7) << " dir expire on " << *dir << " from mds." << from << " replicas was " << dir->replica_map << dendl; dir->remove_replica(from); } else { // this is an old nonce, ignore expire. - dout(7) << " dir expire on " << *dir << " from mds" << from + dout(7) << " dir expire on " << *dir << " from mds." << from << " with old nonce " << nonce << " (current " << dir->get_replica_nonce(from) << "), dropping" << dendl; } @@ -5994,11 +5994,11 @@ void MDCache::handle_cache_expire(MCacheExpire *m) assert(dn); if (nonce == dn->get_replica_nonce(from)) { - dout(7) << " dentry_expire on " << *dn << " from mds" << from << dendl; + dout(7) << " dentry_expire on " << *dn << " from mds." << from << dendl; dentry_remove_replica(dn, from); } else { - dout(7) << " dentry_expire on " << *dn << " from mds" << from + dout(7) << " dentry_expire on " << *dn << " from mds." << from << " with old nonce " << nonce << " (current " << dn->get_replica_nonce(from) << "), dropping" << dendl; } @@ -6258,7 +6258,7 @@ bool MDCache::shutdown_pass() int dest = dir->get_inode()->authority().first; if (dest > 0 && !mds->mdsmap->is_active(dest)) dest = 0; - dout(7) << "sending " << *dir << " back to mds" << dest << dendl; + dout(7) << "sending " << *dir << " back to mds." << dest << dendl; migrator->export_dir(dir, dest); if (--max == 0) break; @@ -6717,7 +6717,7 @@ int MDCache::path_traverse(MDRequest *mdr, Message *req, Context *fin, // wh int from = req->get_source().num(); if (dn->is_replica(from)) { - dout(15) << "traverse: REP would replicate to mds" << from << ", but already cached_by " + dout(15) << "traverse: REP would replicate to mds." << from << ", but already cached_by " << req->get_source() << " dn " << *dn << dendl; } else { dout(10) << "traverse: REP replicating to " << req->get_source() << " dn " << *dn << dendl; @@ -6821,7 +6821,7 @@ int MDCache::path_traverse(MDRequest *mdr, Message *req, Context *fin, // wh #if 0 // request replication? if (mdr && mdr->client_request && curdir->is_rep()) { - dout(15) << "traverse: REP fw to mds" << dauth << ", requesting rep under " + dout(15) << "traverse: REP fw to mds." << dauth << ", requesting rep under " << *curdir << " req " << *(MClientRequest*)req << dendl; mdr->client_request->set_mds_wants_replica_in_dirino(curdir->ino()); req->clear_payload(); // reencode! @@ -7301,7 +7301,7 @@ void MDCache::kick_find_ino_peers(int who) ++p) { find_ino_peer_info_t& fip = p->second; if (fip.checking == who) { - dout(10) << "kicking find_ino_peer " << fip.tid << " who was checking mds" << who << dendl; + dout(10) << "kicking find_ino_peer " << fip.tid << " who was checking mds." << who << dendl; fip.checking = -1; _do_find_ino_peer(fip); } else if (fip.checking == -1) { @@ -7394,7 +7394,7 @@ MDRequest *MDCache::request_start_slave(metareqid_t ri, __u32 attempt, int by) MDRequest *mdr = new MDRequest(ri, attempt, by); assert(active_requests.count(mdr->reqid) == 0); active_requests[mdr->reqid] = mdr; - dout(7) << "request_start_slave " << *mdr << " by mds" << by << dendl; + dout(7) << "request_start_slave " << *mdr << " by mds." << by << dendl; return mdr; } @@ -7438,7 +7438,7 @@ void MDCache::request_finish(MDRequest *mdr) void MDCache::request_forward(MDRequest *mdr, int who, int port) { - dout(7) << "request_forward " << *mdr << " to mds" << who << " req " << *mdr << dendl; + dout(7) << "request_forward " << *mdr << " to mds." << who << " req " << *mdr << dendl; mds->forward_message_mds(mdr->client_request, who); mdr->client_request = 0; @@ -7502,7 +7502,7 @@ void MDCache::request_drop_foreign_locks(MDRequest *mdr) map::iterator q = mdr->remote_wrlocks.begin(); while (q != mdr->remote_wrlocks.end()) { dout(10) << "request_drop_foreign_locks forgetting remote_wrlock " << *q->first - << " on mds" << q->second + << " on mds." << q->second << " on " << *(q->first)->get_parent() << dendl; mdr->locks.erase(q->first); mdr->remote_wrlocks.erase(q++); @@ -8268,7 +8268,7 @@ void MDCache::migrate_stray(CDentry *dn, int to) { CInode *fromino = dn->dir->get_inode(); dout(10) << "migrate_stray from mds" - << MDS_INO_STRAY_OWNER(fromino->inode.ino) << " to mds" << to + << MDS_INO_STRAY_OWNER(fromino->inode.ino) << " to mds." << to << " " << *dn << " " << *dn->get_projected_linkage()->get_inode() << dendl; // rename it to another mds. @@ -8312,7 +8312,7 @@ void MDCache::discover_base_ino(inodeno_t want_ino, Context *onfinish, int from) { - dout(7) << "discover_base_ino " << want_ino << " from mds" << from << dendl; + dout(7) << "discover_base_ino " << want_ino << " from mds." << from << dendl; if (waiting_for_base_ino[from].count(want_ino) == 0) { discover_info_t& d = _create_discover(from); d.ino = want_ino; @@ -8332,7 +8332,7 @@ void MDCache::discover_dir_frag(CInode *base, dirfrag_t df(base->ino(), approx_fg); dout(7) << "discover_dir_frag " << df - << " from mds" << from << dendl; + << " from mds." << from << dendl; if (!base->is_waiter_for(CInode::WAIT_DIR) || !onfinish) { // FIXME: this is kind of weak! discover_info_t& d = _create_discover(from); @@ -8369,7 +8369,7 @@ void MDCache::discover_path(CInode *base, if (from < 0) from = base->authority().first; - dout(7) << "discover_path " << base->ino() << " " << want_path << " snap " << snap << " from mds" << from + dout(7) << "discover_path " << base->ino() << " " << want_path << " snap " << snap << " from mds." << from << (want_xlocked ? " want_xlocked":"") << dendl; @@ -8416,7 +8416,7 @@ void MDCache::discover_path(CDir *base, { int from = base->authority().first; - dout(7) << "discover_path " << base->dirfrag() << " " << want_path << " snap " << snap << " from mds" << from + dout(7) << "discover_path " << base->dirfrag() << " " << want_path << " snap " << snap << " from mds." << from << (want_xlocked ? " want_xlocked":"") << dendl; @@ -8462,7 +8462,7 @@ void MDCache::discover_ino(CDir *base, { int from = base->authority().first; - dout(7) << "discover_ino " << base->dirfrag() << " " << want_ino << " from mds" << from + dout(7) << "discover_ino " << base->dirfrag() << " " << want_ino << " from mds." << from << (want_xlocked ? " want_xlocked":"") << dendl; @@ -8526,7 +8526,7 @@ void MDCache::handle_discover(MDiscover *dis) // get started. if (MDS_INO_IS_BASE(dis->get_base_ino())) { // wants root - dout(7) << "handle_discover from mds" << from + dout(7) << "handle_discover from mds." << from << " wants base + " << dis->get_want().get_path() << " snap " << snapid << dendl; @@ -8548,17 +8548,17 @@ void MDCache::handle_discover(MDiscover *dis) } if (!cur) { - dout(7) << "handle_discover mds" << from + dout(7) << "handle_discover mds." << from << " don't have base ino " << dis->get_base_ino() << "." << snapid << dendl; reply->set_flag_error_dir(); } else if (dis->wants_base_dir()) { - dout(7) << "handle_discover mds" << from + dout(7) << "handle_discover mds." << from << " wants basedir+" << dis->get_want().get_path() << " has " << *cur << dendl; } else { - dout(7) << "handle_discover mds" << from + dout(7) << "handle_discover mds." << from << " wants " << dis->get_want().get_path() << " has " << *cur << dendl; @@ -8778,7 +8778,7 @@ void MDCache::handle_discover(MDiscover *dis) // how did we do? assert(!reply->is_empty()); - dout(7) << "handle_discover sending result back to asker mds" << from << dendl; + dout(7) << "handle_discover sending result back to asker mds." << from << dendl; mds->send_message(reply, dis->get_connection()); dis->put(); @@ -9004,7 +9004,7 @@ CDir *MDCache::forge_replica_dir(CInode *diri, frag_t fg, int from) // i'm assuming this is a subtree root. adjust_subtree_auth(dir, from); - dout(7) << "forge_replica_dir added " << *dir << " while mds" << from << " is down" << dendl; + dout(7) << "forge_replica_dir added " << *dir << " while mds." << from << " is down" << dendl; return dir; } diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc index 4d87ea321c27a..6e2b7bbb8460e 100644 --- a/src/mds/MDLog.cc +++ b/src/mds/MDLog.cc @@ -31,7 +31,7 @@ #undef DOUT_COND #define DOUT_COND(cct, l) l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_log #undef dout_prefix -#define dout_prefix *_dout << "mds" << mds->get_nodeid() << ".log " +#define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".log " // cons/des MDLog::~MDLog() diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc index d31e0acd223b3..d22e44ad154b2 100644 --- a/src/mds/MDS.cc +++ b/src/mds/MDS.cc @@ -78,7 +78,7 @@ #define DOUT_SUBSYS mds #undef dout_prefix -#define dout_prefix *_dout << "mds" << whoami << '.' << incarnation << ' ' +#define dout_prefix *_dout << "mds." << whoami << '.' << incarnation << ' ' @@ -325,7 +325,7 @@ void MDS::send_message(Message *m, Connection *c) void MDS::send_message_mds(Message *m, int mds) { if (!mdsmap->is_up(mds)) { - dout(10) << "send_message_mds mds" << mds << " not up, dropping " << *m << dendl; + dout(10) << "send_message_mds mds." << mds << " not up, dropping " << *m << dendl; m->put(); return; } @@ -872,7 +872,7 @@ void MDS::handle_mds_map(MMDSMap *m) whoami = mdsmap->get_rank_gid(monc->get_global_id()); state = mdsmap->get_state_gid(monc->get_global_id()); incarnation = mdsmap->get_inc_gid(monc->get_global_id()); - dout(10) << "map says i am " << addr << " mds" << whoami << "." << incarnation + dout(10) << "map says i am " << addr << " mds." << whoami << "." << incarnation << " state " << ceph_mds_state_name(state) << dendl; // mark down any failed peers @@ -933,11 +933,11 @@ void MDS::handle_mds_map(MMDSMap *m) if (oldwhoami != whoami || oldstate != state) { // update messenger. if (state == MDSMap::STATE_STANDBY_REPLAY || state == MDSMap::STATE_ONESHOT_REPLAY) { - dout(1) << "handle_mds_map i am now mds" << monc->get_global_id() << "." << incarnation - << "replaying mds" << whoami << "." << incarnation << dendl; + dout(1) << "handle_mds_map i am now mds." << monc->get_global_id() << "." << incarnation + << "replaying mds." << whoami << "." << incarnation << dendl; messenger->set_myname(entity_name_t::MDS(monc->get_global_id())); } else { - dout(1) << "handle_mds_map i am now mds" << whoami << "." << incarnation << dendl; + dout(1) << "handle_mds_map i am now mds." << whoami << "." << incarnation << dendl; messenger->set_myname(entity_name_t::MDS(whoami)); } } @@ -1519,7 +1519,7 @@ void MDS::recovery_done() void MDS::handle_mds_recovery(int who) { - dout(5) << "handle_mds_recovery mds" << who << dendl; + dout(5) << "handle_mds_recovery mds." << who << dendl; mdcache->handle_mds_recovery(who); diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc index d0997e6e2c4f1..41f8b28a3b536 100644 --- a/src/mds/MDSMap.cc +++ b/src/mds/MDSMap.cc @@ -150,7 +150,7 @@ void MDSMap::print(ostream& out) out << p->second << ":\t" << info.addr << " '" << info.name << "'" - << " mds" << info.rank + << " mds." << info.rank << "." << info.inc << " " << ceph_mds_state_name(info.state) << " seq " << info.state_seq; diff --git a/src/mds/MDSTable.cc b/src/mds/MDSTable.cc index afaa2ba78b04f..41d69003dcf32 100644 --- a/src/mds/MDSTable.cc +++ b/src/mds/MDSTable.cc @@ -26,7 +26,7 @@ #define DOUT_SUBSYS mds #undef dout_prefix -#define dout_prefix *_dout << "mds" << mds->get_nodeid() << "." << table_name << ": " +#define dout_prefix *_dout << "mds." << mds->get_nodeid() << "." << table_name << ": " class C_MT_Save : public Context { diff --git a/src/mds/MDSTableClient.cc b/src/mds/MDSTableClient.cc index 4bd8deae38bbc..675dfd66d4b62 100644 --- a/src/mds/MDSTableClient.cc +++ b/src/mds/MDSTableClient.cc @@ -32,7 +32,7 @@ #define DOUT_SUBSYS mds #undef dout_prefix -#define dout_prefix *_dout << "mds" << mds->get_nodeid() << ".tableclient(" << get_mdstable_name(table) << ") " +#define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".tableclient(" << get_mdstable_name(table) << ") " void MDSTableClient::handle_request(class MMDSTableRequest *m) @@ -147,7 +147,7 @@ void MDSTableClient::send_to_tableserver(MMDSTableRequest *req) if (mds->mdsmap->get_state(ts) >= MDSMap::STATE_CLIENTREPLAY) mds->send_message_mds(req, ts); else { - dout(10) << " deferring request to not-yet-active tableserver mds" << ts << dendl; + dout(10) << " deferring request to not-yet-active tableserver mds." << ts << dendl; } } @@ -204,7 +204,7 @@ void MDSTableClient::resend_commits() void MDSTableClient::handle_mds_recovery(int who) { - dout(7) << "handle_mds_recovery mds" << who << dendl; + dout(7) << "handle_mds_recovery mds." << who << dendl; if (who != mds->mdsmap->get_tableserver()) return; // do nothing. diff --git a/src/mds/MDSTableServer.cc b/src/mds/MDSTableServer.cc index fec3df28bb166..bc03ca61e7273 100644 --- a/src/mds/MDSTableServer.cc +++ b/src/mds/MDSTableServer.cc @@ -22,7 +22,7 @@ #define DOUT_SUBSYS mds #undef dout_prefix -#define dout_prefix *_dout << "mds" << mds->get_nodeid() << ".tableserver(" << get_mdstable_name(table) << ") " +#define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".tableserver(" << get_mdstable_name(table) << ") " /* This function DOES put the passed message before returning */ void MDSTableServer::handle_request(MMDSTableRequest *req) @@ -151,7 +151,7 @@ void MDSTableServer::finish_recovery() void MDSTableServer::handle_mds_recovery(int who) { if (who >= 0) - dout(7) << "handle_mds_recovery mds" << who << dendl; + dout(7) << "handle_mds_recovery mds." << who << dendl; // resend agrees for recovered mds for (map::iterator p = pending_for_mds.begin(); diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc index 2fe75c1ddb45d..2b618f752f17a 100644 --- a/src/mds/Migrator.cc +++ b/src/mds/Migrator.cc @@ -80,7 +80,7 @@ #undef DOUT_COND #define DOUT_COND(cct, l) (l <= cct->_conf->debug_mds || l <= cct->_conf->debug_mds_migrator) #undef dout_prefix -#define dout_prefix *_dout << "mds" << mds->get_nodeid() << ".migrator " +#define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".migrator " /* This function DOES put the passed message before returning*/ void Migrator::dispatch(Message *m) @@ -179,7 +179,7 @@ void Migrator::export_empty_import(CDir *dir) dout(7) << " really empty, exporting to " << dest << dendl; assert (dest != mds->get_nodeid()); - dout(7) << "exporting to mds" << dest + dout(7) << "exporting to mds." << dest << " empty import " << *dir << dendl; export_dir( dir, dest ); } @@ -192,7 +192,7 @@ void Migrator::export_empty_import(CDir *dir) void Migrator::handle_mds_failure_or_stop(int who) { - dout(5) << "handle_mds_failure_or_stop mds" << who << dendl; + dout(5) << "handle_mds_failure_or_stop mds." << who << dendl; // check my exports @@ -325,8 +325,8 @@ void Migrator::handle_mds_failure_or_stop(int who) export_notify_ack_waiting[dir].erase(who); // they won't get a notify either. if (p->second == EXPORT_WARNING) { // exporter waiting for warning acks, let's fake theirs. - dout(10) << "faking export_warning_ack from mds" << who - << " on " << *dir << " to mds" << export_peer[dir] + dout(10) << "faking export_warning_ack from mds." << who + << " on " << *dir << " to mds." << export_peer[dir] << dendl; if (export_warning_ack_waiting[dir].empty()) export_go(dir); @@ -337,8 +337,8 @@ void Migrator::handle_mds_failure_or_stop(int who) export_notify_ack_waiting[dir].erase(who); if (p->second == EXPORT_NOTIFYING) { // exporter is waiting for notify acks, fake it - dout(10) << "faking export_notify_ack from mds" << who - << " on " << *dir << " to mds" << export_peer[dir] + dout(10) << "faking export_notify_ack from mds." << who + << " on " << *dir << " to mds." << export_peer[dir] << dendl; if (export_notify_ack_waiting[dir].empty()) export_finish(dir); @@ -432,8 +432,8 @@ void Migrator::handle_mds_failure_or_stop(int who) } else { if (q->second == IMPORT_ABORTING && import_bystanders[dir].count(who)) { - dout(10) << "faking export_notify_ack from mds" << who - << " on aborting import " << *dir << " from mds" << import_peer[df] + dout(10) << "faking export_notify_ack from mds." << who + << " on aborting import " << *dir << " from mds." << import_peer[df] << dendl; import_bystanders[dir].erase(who); if (import_bystanders[dir].empty()) { @@ -570,7 +570,7 @@ void Migrator::maybe_do_queued_export() if (!dir) continue; if (!dir->is_auth()) continue; - dout(0) << "nicely exporting to mds" << dest << " " << *dir << dendl; + dout(0) << "nicely exporting to mds." << dest << " " << *dir << dendl; export_dir(dir, dest); } @@ -760,7 +760,7 @@ void Migrator::export_frozen(CDir *dir) p != dir->replicas_end(); p++) { if (p->first != dest) { - dout(10) << "bystander mds" << p->first << dendl; + dout(10) << "bystander mds." << p->first << dendl; prep->add_bystander(p->first); } } @@ -2151,7 +2151,7 @@ void Migrator::import_logged_start(dirfrag_t df, CDir *dir, int from, } // send notify's etc. - dout(7) << "sending ack for " << *dir << " to old auth mds" << from << dendl; + dout(7) << "sending ack for " << *dir << " to old auth mds." << from << dendl; // test surviving observer of a failed migration that did not complete //assert(dir->replica_map.size() < 2 || mds->whoami != 0); @@ -2519,7 +2519,7 @@ void Migrator::handle_export_notify(MExportDirNotify *m) void Migrator::export_caps(CInode *in) { int dest = in->authority().first; - dout(7) << "export_caps to mds" << dest << " " << *in << dendl; + dout(7) << "export_caps to mds." << dest << " " << *in << dendl; assert(in->is_any_caps()); assert(!in->is_auth()); diff --git a/src/mds/Mutation.cc b/src/mds/Mutation.cc index 1f2b6a9a1efaa..6321ffc160acf 100644 --- a/src/mds/Mutation.cc +++ b/src/mds/Mutation.cc @@ -202,7 +202,7 @@ void MDRequest::print(ostream &out) { out << "request(" << reqid; //if (request) out << " " << *request; - if (is_slave()) out << " slave_to mds" << slave_to_mds; + if (is_slave()) out << " slave_to mds." << slave_to_mds; if (client_request) out << " cr=" << client_request; if (slave_request) out << " sr=" << slave_request; out << ")"; diff --git a/src/mds/Server.cc b/src/mds/Server.cc index c67f13ad46d04..4f7947afdeef1 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -62,7 +62,7 @@ using namespace std; #define DOUT_SUBSYS mds #undef dout_prefix -#define dout_prefix *_dout << "mds" << mds->get_nodeid() << ".server " +#define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".server " void Server::create_logger() { @@ -1253,7 +1253,7 @@ void Server::handle_slave_request(MMDSSlaveRequest *m) mdcache->request_finish(mdr); mdr = NULL; } else if (mdr->slave_to_mds != from) { - dout(10) << "local request " << *mdr << " not slave to mds" << from << dendl; + dout(10) << "local request " << *mdr << " not slave to mds." << from << dendl; m->put(); return; } @@ -1701,7 +1701,7 @@ CInode* Server::prepare_new_inode(MDRequest *mdr, CDir *dir, inodeno_t useino, u dout(0) << "WARNING: client specified " << useino << " and i allocated " << in->inode.ino << dendl; mds->clog.error() << mdr->client_request->get_source() << " specified ino " << useino - << " but mds" << mds->whoami << " allocated " << in->inode.ino << "\n"; + << " but mds." << mds->whoami << " allocated " << in->inode.ino << "\n"; //assert(0); // just for now. } @@ -2041,7 +2041,7 @@ CDir* Server::try_open_auth_dirfrag(CInode *diri, frag_t fg, MDRequest *mdr) // not open and inode not mine? if (!dir && !diri->is_auth()) { int inauth = diri->authority().first; - dout(7) << "try_open_auth_dirfrag: not open, not inode auth, fw to mds" << inauth << dendl; + dout(7) << "try_open_auth_dirfrag: not open, not inode auth, fw to mds." << inauth << dendl; mdcache->request_forward(mdr, inauth); return 0; } @@ -2062,7 +2062,7 @@ CDir* Server::try_open_auth_dirfrag(CInode *diri, frag_t fg, MDRequest *mdr) if (!dir->is_auth()) { int auth = dir->authority().first; dout(7) << "try_open_auth_dirfrag: not auth for " << *dir - << ", fw to mds" << auth << dendl; + << ", fw to mds." << auth << dendl; mdcache->request_forward(mdr, auth); return 0; } @@ -4466,7 +4466,7 @@ void Server::handle_client_unlink(MDRequest *mdr) CDir *dir = *p; int auth = dir->authority().first; witnesses.insert(auth); - dout(10) << " need mds" << auth << " to witness for dirfrag " << *dir << dendl; + dout(10) << " need mds." << auth << " to witness for dirfrag " << *dir << dendl; } dout(10) << " witnesses " << witnesses << ", have " << mdr->more()->witnessed << dendl; @@ -4474,9 +4474,9 @@ void Server::handle_client_unlink(MDRequest *mdr) p != witnesses.end(); ++p) { if (mdr->more()->witnessed.count(*p)) { - dout(10) << " already witnessed by mds" << *p << dendl; + dout(10) << " already witnessed by mds." << *p << dendl; } else if (mdr->more()->waiting_on_slave.count(*p)) { - dout(10) << " already waiting on witness mds" << *p << dendl; + dout(10) << " already waiting on witness mds." << *p << dendl; } else { _rmdir_prepare_witness(mdr, *p, dn, straydn); } @@ -4638,7 +4638,7 @@ void Server::_unlink_local_finish(MDRequest *mdr, void Server::_rmdir_prepare_witness(MDRequest *mdr, int who, CDentry *dn, CDentry *straydn) { - dout(10) << "_rmdir_prepare_witness mds" << who << " for " << *mdr << dendl; + dout(10) << "_rmdir_prepare_witness mds." << who << " for " << *mdr << dendl; MMDSSlaveRequest *req = new MMDSSlaveRequest(mdr->reqid, mdr->attempt, MMDSSlaveRequest::OP_RMDIRPREP); @@ -5154,7 +5154,7 @@ void Server::handle_client_rename(MDRequest *mdr) xlocks.insert(&srcdn->lock); int srcdirauth = srcdn->get_dir()->authority().first; if (srcdirauth != mds->whoami) { - dout(10) << " will remote_wrlock srcdir scatterlocks on mds" << srcdirauth << dendl; + dout(10) << " will remote_wrlock srcdir scatterlocks on mds." << srcdirauth << dendl; remote_wrlocks[&srcdn->get_dir()->inode->filelock] = srcdirauth; remote_wrlocks[&srcdn->get_dir()->inode->nestlock] = srcdirauth; } else { @@ -5270,9 +5270,9 @@ void Server::handle_client_rename(MDRequest *mdr) ++p) { if (*p == last) continue; // do it last! if (mdr->more()->witnessed.count(*p)) { - dout(10) << " already witnessed by mds" << *p << dendl; + dout(10) << " already witnessed by mds." << *p << dendl; } else if (mdr->more()->waiting_on_slave.count(*p)) { - dout(10) << " already waiting on witness mds" << *p << dendl; + dout(10) << " already waiting on witness mds." << *p << dendl; } else { _rename_prepare_witness(mdr, *p, srcdn, destdn, straydn); } @@ -5400,7 +5400,7 @@ void Server::_rename_finish(MDRequest *mdr, CDentry *srcdn, CDentry *destdn, CDe void Server::_rename_prepare_witness(MDRequest *mdr, int who, CDentry *srcdn, CDentry *destdn, CDentry *straydn) { - dout(10) << "_rename_prepare_witness mds" << who << dendl; + dout(10) << "_rename_prepare_witness mds." << who << dendl; MMDSSlaveRequest *req = new MMDSSlaveRequest(mdr->reqid, mdr->attempt, MMDSSlaveRequest::OP_RENAMEPREP); srcdn->make_path(req->srcdnpath); diff --git a/src/mds/SessionMap.cc b/src/mds/SessionMap.cc index 54b684db85daf..5baa43e13def5 100644 --- a/src/mds/SessionMap.cc +++ b/src/mds/SessionMap.cc @@ -21,7 +21,7 @@ #define DOUT_SUBSYS mds #undef dout_prefix -#define dout_prefix *_dout << "mds" << mds->get_nodeid() << ".sessionmap " +#define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".sessionmap " void SessionMap::dump() diff --git a/src/mds/SnapServer.cc b/src/mds/SnapServer.cc index 26461477d1b48..5352b22c5f56c 100644 --- a/src/mds/SnapServer.cc +++ b/src/mds/SnapServer.cc @@ -27,7 +27,7 @@ #define DOUT_SUBSYS mds #undef dout_prefix -#define dout_prefix *_dout << "mds" << mds->get_nodeid() << ".snap " +#define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".snap " void SnapServer::reset_state() diff --git a/src/mds/events/ESlaveUpdate.h b/src/mds/events/ESlaveUpdate.h index c5f8e10847981..240fc7bbfc6cb 100644 --- a/src/mds/events/ESlaveUpdate.h +++ b/src/mds/events/ESlaveUpdate.h @@ -192,7 +192,7 @@ public: if (origop == LINK) out << " link"; if (origop == RENAME) out << " rename"; out << " " << reqid; - out << " for mds" << master; + out << " for mds." << master; out << commit; } diff --git a/src/mds/events/ETableServer.h b/src/mds/events/ETableServer.h index 68e16c962dc5b..6818e8557ba98 100644 --- a/src/mds/events/ETableServer.h +++ b/src/mds/events/ETableServer.h @@ -65,7 +65,7 @@ struct ETableServer : public LogEvent { out << "ETableServer " << get_mdstable_name(table) << " " << get_mdstableserver_opname(op); if (reqid) out << " reqid " << reqid; - if (bymds >= 0) out << " mds" << bymds; + if (bymds >= 0) out << " mds." << bymds; if (tid) out << " tid " << tid; if (version) out << " version " << version; if (mutation.length()) out << " mutation=" << mutation.length() << " bytes"; diff --git a/src/mds/journal.cc b/src/mds/journal.cc index 2583564f234b3..5f74bbb12bcc6 100644 --- a/src/mds/journal.cc +++ b/src/mds/journal.cc @@ -59,7 +59,7 @@ #define DOUT_COND(cct, l) (l<=cct->_conf->debug_mds || l <= cct->_conf->debug_mds_log \ || l <= cct->_conf->debug_mds_log_expire) #undef dout_prefix -#define dout_prefix *_dout << "mds" << mds->get_nodeid() << ".journal " +#define dout_prefix *_dout << "mds." << mds->get_nodeid() << ".journal " // ----------------------- @@ -1049,7 +1049,7 @@ void ESlaveUpdate::replay(MDS *mds) { switch (op) { case ESlaveUpdate::OP_PREPARE: - dout(10) << "ESlaveUpdate.replay prepare " << reqid << " for mds" << master + dout(10) << "ESlaveUpdate.replay prepare " << reqid << " for mds." << master << ": applying commit, saving rollback info" << dendl; assert(mds->mdcache->uncommitted_slave_updates[master].count(reqid) == 0); commit.replay(mds, _segment); @@ -1059,20 +1059,20 @@ void ESlaveUpdate::replay(MDS *mds) case ESlaveUpdate::OP_COMMIT: if (mds->mdcache->uncommitted_slave_updates[master].count(reqid)) { - dout(10) << "ESlaveUpdate.replay commit " << reqid << " for mds" << master << dendl; + dout(10) << "ESlaveUpdate.replay commit " << reqid << " for mds." << master << dendl; delete mds->mdcache->uncommitted_slave_updates[master][reqid]; mds->mdcache->uncommitted_slave_updates[master].erase(reqid); if (mds->mdcache->uncommitted_slave_updates[master].empty()) mds->mdcache->uncommitted_slave_updates.erase(master); } else { - dout(10) << "ESlaveUpdate.replay commit " << reqid << " for mds" << master + dout(10) << "ESlaveUpdate.replay commit " << reqid << " for mds." << master << ": ignoring, no previously saved prepare" << dendl; } break; case ESlaveUpdate::OP_ROLLBACK: if (mds->mdcache->uncommitted_slave_updates[master].count(reqid)) { - dout(10) << "ESlaveUpdate.replay abort " << reqid << " for mds" << master + dout(10) << "ESlaveUpdate.replay abort " << reqid << " for mds." << master << ": applying rollback commit blob" << dendl; assert(mds->mdcache->uncommitted_slave_updates[master].count(reqid)); commit.replay(mds, _segment); @@ -1081,7 +1081,7 @@ void ESlaveUpdate::replay(MDS *mds) if (mds->mdcache->uncommitted_slave_updates[master].empty()) mds->mdcache->uncommitted_slave_updates.erase(master); } else { - dout(10) << "ESlaveUpdate.replay abort " << reqid << " for mds" << master + dout(10) << "ESlaveUpdate.replay abort " << reqid << " for mds." << master << ": ignoring, no previously saved prepare" << dendl; } break; diff --git a/src/mds/snap.cc b/src/mds/snap.cc index 7444ac66dec68..0b77d7c696bbb 100644 --- a/src/mds/snap.cc +++ b/src/mds/snap.cc @@ -27,7 +27,7 @@ #define dout_prefix _prefix(_dout, mdcache->mds->get_nodeid(), inode, srnode.seq, this) static ostream& _prefix(std::ostream *_dout, int whoami, CInode *inode, uint64_t seq, SnapRealm *realm) { - return *_dout << " mds" << whoami + return *_dout << " mds." << whoami << ".cache.snaprealm(" << inode->ino() << " seq " << seq << " " << realm << ") "; } diff --git a/src/messages/MClientRequestForward.h b/src/messages/MClientRequestForward.h index 4f64acb648b6a..fba5e124f1e64 100644 --- a/src/messages/MClientRequestForward.h +++ b/src/messages/MClientRequestForward.h @@ -40,7 +40,7 @@ public: const char *get_type_name() { return "client_request_forward"; } void print(ostream& o) { o << "client_request_forward(" << get_tid() - << " to mds" << dest_mds + << " to mds." << dest_mds << " num_fwd=" << num_fwd << (client_must_resend ? " client_must_resend":"") << ")"; diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index 2817fea026b0b..6b9fe470dc0d0 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -253,7 +253,7 @@ bool MDSMonitor::preprocess_beacon(MMDSBeacon *m) (pending_mdsmap.is_degraded() || ((m->get_standby_for_rank() >= 0) && pending_mdsmap.get_state(m->get_standby_for_rank()) < MDSMap::STATE_ACTIVE))) { - dout(10) << "mds_beacon can't standby-replay mds" << m->get_standby_for_rank() << " at this time (cluster degraded, or mds not active)" << dendl; + dout(10) << "mds_beacon can't standby-replay mds." << m->get_standby_for_rank() << " at this time (cluster degraded, or mds not active)" << dendl; dout(10) << "pending_mdsmap.is_degraded()==" << pending_mdsmap.is_degraded() << " rank state: " << ceph_mds_state_name(pending_mdsmap.get_state(m->get_standby_for_rank())) << dendl; goto ignore; @@ -383,7 +383,7 @@ bool MDSMonitor::prepare_beacon(MMDSBeacon *m) info.clear_laggy(); } - dout(10) << "prepare_beacon mds" << info.rank + dout(10) << "prepare_beacon mds." << info.rank << " " << ceph_mds_state_name(info.state) << " -> " << ceph_mds_state_name(state) << " standby_for_rank=" << m->get_standby_for_rank() @@ -595,7 +595,7 @@ bool MDSMonitor::preprocess_command(MMonCommand *m) r = 0; ss << "ok"; } else { - ss << "mds" << who << " no up"; + ss << "mds." << who << " no up"; r = -ENOENT; } } else ss << "specify mds number or *"; @@ -653,7 +653,7 @@ int MDSMonitor::fail_mds(std::ostream &ss, const std::string &arg) } pending_mdsmap.up.erase(w); pending_mdsmap.failed.insert(w); - ss << "failed mds" << w; + ss << "failed mds." << w; } return 0; } @@ -706,7 +706,7 @@ bool MDSMonitor::prepare_command(MMonCommand *m) int who = atoi(m->cmd[2].c_str()); if (!mdsmap.is_active(who)) { r = -EEXIST; - ss << "mds" << who << " not active (" + ss << "mds." << who << " not active (" << ceph_mds_state_name(mdsmap.get_state(who)) << ")"; } else if ((mdsmap.get_root() == who || mdsmap.get_tableserver() == who) && @@ -717,7 +717,7 @@ bool MDSMonitor::prepare_command(MMonCommand *m) } else { r = 0; uint64_t gid = pending_mdsmap.up[who]; - ss << "telling mds" << who << " " << pending_mdsmap.mds_info[gid].addr << " to stop"; + ss << "telling mds." << who << " " << pending_mdsmap.mds_info[gid].addr << " to stop"; pending_mdsmap.mds_info[gid].state = MDSMap::STATE_STOPPING; } } @@ -773,7 +773,7 @@ bool MDSMonitor::prepare_command(MMonCommand *m) int w = atoi(m->cmd[2].c_str()); pending_mdsmap.failed.erase(w); stringstream ss; - ss << "removed failed mds" << w; + ss << "removed failed mds." << w; string rs; getline(ss, rs); paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, paxos->get_version())); @@ -914,7 +914,7 @@ void MDSMonitor::tick() break; MDSMap::mds_info_t& info = pending_mdsmap.mds_info[newgid]; - dout(1) << "adding standby " << info.addr << " as mds" << mds << dendl; + dout(1) << "adding standby " << info.addr << " as mds." << mds << dendl; info.rank = mds; if (pending_mdsmap.stopped.count(mds)) { @@ -939,7 +939,7 @@ void MDSMonitor::tick() ++p) { if (last_beacon.count(p->first) == 0) { const MDSMap::mds_info_t& info = p->second; - dout(10) << " adding " << p->second.addr << " mds" << info.rank << "." << info.inc + dout(10) << " adding " << p->second.addr << " mds." << info.rank << "." << info.inc << " " << ceph_mds_state_name(info.state) << " to last_beacon" << dendl; last_beacon[p->first].stamp = ceph_clock_now(g_ceph_context); @@ -969,7 +969,7 @@ void MDSMonitor::tick() MDSMap::mds_info_t& info = pending_mdsmap.mds_info[gid]; - dout(10) << "no beacon from " << gid << " " << info.addr << " mds" << info.rank << "." << info.inc + dout(10) << "no beacon from " << gid << " " << info.addr << " mds." << info.rank << "." << info.inc << " " << ceph_mds_state_name(info.state) << " since " << since << dendl; @@ -981,7 +981,7 @@ void MDSMonitor::tick() info.state != MDSMap::STATE_STANDBY_REPLAY && (sgid = pending_mdsmap.find_replacement_for(info.rank, info.name)) != 0) { MDSMap::mds_info_t& si = pending_mdsmap.mds_info[sgid]; - dout(10) << " replacing " << gid << " " << info.addr << " mds" << info.rank << "." << info.inc + dout(10) << " replacing " << gid << " " << info.addr << " mds." << info.rank << "." << info.inc << " " << ceph_mds_state_name(info.state) << " with " << sgid << "/" << si.name << " " << si.addr << dendl; switch (info.state) { @@ -1021,7 +1021,7 @@ void MDSMonitor::tick() last_beacon.erase(gid); do_propose = true; } else if (info.state == MDSMap::STATE_STANDBY_REPLAY) { - dout(10) << " failing " << gid << " " << info.addr << " mds" << info.rank << "." << info.inc + dout(10) << " failing " << gid << " " << info.addr << " mds." << info.rank << "." << info.inc << " " << ceph_mds_state_name(info.state) << dendl; pending_mdsmap.mds_info.erase(gid); @@ -1031,12 +1031,12 @@ void MDSMonitor::tick() if (info.state == MDSMap::STATE_STANDBY || info.state == MDSMap::STATE_STANDBY_REPLAY) { // remove it - dout(10) << " removing " << gid << " " << info.addr << " mds" << info.rank << "." << info.inc + dout(10) << " removing " << gid << " " << info.addr << " mds." << info.rank << "." << info.inc << " " << ceph_mds_state_name(info.state) << " (laggy)" << dendl; pending_mdsmap.mds_info.erase(gid); } else if (!info.laggy()) { - dout(10) << " marking " << gid << " " << info.addr << " mds" << info.rank << "." << info.inc + dout(10) << " marking " << gid << " " << info.addr << " mds." << info.rank << "." << info.inc << " " << ceph_mds_state_name(info.state) << " laggy" << dendl; info.laggy_since = now; @@ -1064,7 +1064,7 @@ void MDSMonitor::tick() sgid = pending_mdsmap.find_replacement_for(f, name); if (sgid) { MDSMap::mds_info_t& si = pending_mdsmap.mds_info[sgid]; - dout(0) << " taking over failed mds" << f << " with " << sgid << "/" << si.name << " " << si.addr << dendl; + dout(0) << " taking over failed mds." << f << " with " << sgid << "/" << si.name << " " << si.addr << dendl; si.state = MDSMap::STATE_REPLAY; si.rank = f; si.inc = ++pending_mdsmap.inc[f]; @@ -1130,7 +1130,7 @@ bool MDSMonitor::try_standby_replay(MDSMap::mds_info_t& finfo, MDSMap::mds_info_ uint64_t lgid = pending_mdsmap.find_standby_for(ainfo.rank, ainfo.name); if (lgid) { MDSMap::mds_info_t& sinfo = pending_mdsmap.mds_info[lgid]; - dout(20) << " mds" << ainfo.rank + dout(20) << " mds." << ainfo.rank << " standby gid " << lgid << " with state " << ceph_mds_state_name(sinfo.state) << dendl; -- 2.39.5