diff options
author | Sage Weil <sage.weil@dreamhost.com> | 2011-09-27 21:46:26 -0700 |
---|---|---|
committer | Sage Weil <sage.weil@dreamhost.com> | 2011-09-27 21:46:26 -0700 |
commit | a1521ae82c329be6774e54f8a77b194295b426ae (patch) | |
tree | 37fd291506afaa96a9ae0540136ae6c697db4ec6 /src/mds/Locker.cc | |
parent | 214e7b199dd5ec5618e49b7fbf162ad71d2e9cc6 (diff) | |
download | ceph-a1521ae82c329be6774e54f8a77b194295b426ae.tar.gz |
clientN -> client.N
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Diffstat (limited to 'src/mds/Locker.cc')
-rw-r--r-- | src/mds/Locker.cc | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index 797d48c9529..3b9fbdca19a 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -770,11 +770,11 @@ bool Locker::eval(CInode *in, int mask) if (in->is_auth() && in->is_head()) { if (in->choose_ideal_loner() >= 0) { if (in->try_set_loner()) { - dout(10) << "eval set loner to client" << in->get_loner() << dendl; + dout(10) << "eval set loner to client." << in->get_loner() << dendl; need_issue = true; mask = -1; } else - dout(10) << "eval want loner client" << in->get_wanted_loner() << " but failed to set it" << dendl; + dout(10) << "eval want loner client." << in->get_wanted_loner() << " but failed to set it" << dendl; } else dout(10) << "eval doesn't want loner" << dendl; } @@ -1636,7 +1636,7 @@ bool Locker::issue_caps(CInode *in, Capability *only_cap) client_t loner = in->get_loner(); if (loner >= 0) { - dout(7) << "issue_caps loner client" << loner + dout(7) << "issue_caps loner client." << loner << " allowed=" << ccap_string(loner_allowed) << ", xlocker allowed=" << ccap_string(xlocker_allowed) << ", others allowed=" << ccap_string(all_allowed) @@ -1676,7 +1676,7 @@ bool Locker::issue_caps(CInode *in, Capability *only_cap) int pending = cap->pending(); int wanted = cap->wanted(); - dout(20) << " client" << it->first + dout(20) << " client." << it->first << " pending " << ccap_string(pending) << " allowed " << ccap_string(allowed) << " wanted " << ccap_string(wanted) @@ -1684,7 +1684,7 @@ bool Locker::issue_caps(CInode *in, Capability *only_cap) // skip if suppress, and not revocation if (cap->is_suppress() && !(pending & ~allowed)) { - dout(20) << " suppressed and !revoke, skipping client" << it->first << dendl; + dout(20) << " suppressed and !revoke, skipping client." << it->first << dendl; continue; } @@ -1706,7 +1706,7 @@ bool Locker::issue_caps(CInode *in, Capability *only_cap) int after = cap->pending(); if (seq > 0) { - dout(7) << " sending MClientCaps to client" << it->first + dout(7) << " sending MClientCaps to client." << it->first << " seq " << cap->get_last_seq() << " new pending " << ccap_string(after) << " was " << ccap_string(before) << dendl; @@ -2052,7 +2052,7 @@ void Locker::share_inode_max_size(CInode *in) if (cap->is_suppress()) continue; if (cap->pending() & (CEPH_CAP_FILE_WR|CEPH_CAP_FILE_BUFFER)) { - dout(10) << "share_inode_max_size with client" << client << dendl; + dout(10) << "share_inode_max_size with client." << client << dendl; MClientCaps *m = new MClientCaps(CEPH_CAP_OP_GRANT, in->ino(), in->find_snaprealm()->inode->ino(), @@ -2110,7 +2110,7 @@ void Locker::adjust_cap_wanted(Capability *cap, int wanted, int issue_seq) void Locker::_do_null_snapflush(CInode *head_in, client_t client, snapid_t follows) { - dout(10) << "_do_null_snapflish client" << client << " follows " << follows << " on " << *head_in << dendl; + dout(10) << "_do_null_snapflish client." << client << " follows " << follows << " on " << *head_in << dendl; map<snapid_t, set<client_t> >::iterator p = head_in->client_need_snapflush.begin(); while (p != head_in->client_need_snapflush.end()) { snapid_t snapid = p->first; @@ -2121,7 +2121,7 @@ void Locker::_do_null_snapflush(CInode *head_in, client_t client, snapid_t follo if (follows > snapid) break; if (clients.count(client)) { - dout(10) << " doing async NULL snapflush on " << snapid << " from client" << client << dendl; + dout(10) << " doing async NULL snapflush on " << snapid << " from client." << client << dendl; CInode *sin = mdcache->get_inode(head_in->ino(), snapid); if (!sin) { // hrm, look forward until we find the inode. @@ -2204,7 +2204,7 @@ void Locker::handle_client_caps(MClientCaps *m) if (!cap && in != head_in) cap = head_in->get_client_cap(client); if (!cap) { - dout(7) << "handle_client_caps no cap for client" << client << " on " << *in << dendl; + dout(7) << "handle_client_caps no cap for client." << client << " on " << *in << dendl; m->put(); return; } @@ -2240,7 +2240,7 @@ void Locker::handle_client_caps(MClientCaps *m) (head_in->client_need_snapflush.count(snap) && head_in->client_need_snapflush[snap].count(client))) { dout(7) << " flushsnap snap " << snap - << " client" << client << " on " << *in << dendl; + << " client." << client << " on " << *in << dendl; // this cap now follows a later snap (i.e. the one initiating this flush, or later) cap->client_follows = MAX(follows, in->first) + 1; @@ -2261,7 +2261,7 @@ void Locker::handle_client_caps(MClientCaps *m) head_in->remove_need_snapflush(in, snap, client); } else - dout(7) << " not expecting flushsnap " << snap << " from client" << client << " on " << *in << dendl; + dout(7) << " not expecting flushsnap " << snap << " from client." << client << " on " << *in << dendl; goto out; } @@ -2304,7 +2304,7 @@ void Locker::handle_client_caps(MClientCaps *m) } if (m->get_dirty() && in->is_auth()) { - dout(7) << " flush client" << client << " dirty " << ccap_string(m->get_dirty()) + dout(7) << " flush client." << client << " dirty " << ccap_string(m->get_dirty()) << " seq " << m->get_seq() << " on " << *in << dendl; ack = new MClientCaps(CEPH_CAP_OP_FLUSH_ACK, in->ino(), 0, cap->get_cap_id(), m->get_seq(), m->get_caps(), 0, m->get_dirty(), 0); @@ -2387,7 +2387,7 @@ void Locker::process_request_cap_release(MDRequest *mdr, client_t client, const dn->remove_client_lease(l, this); } } else { - mds->clog.warn() << "client" << client << " released lease on dn " + mds->clog.warn() << "client." << client << " released lease on dn " << dir->dirfrag() << "/" << dname << " which dne\n"; } } @@ -2397,7 +2397,7 @@ void Locker::process_request_cap_release(MDRequest *mdr, client_t client, const if (!cap) return; - dout(10) << "process_cap_update client" << client << " " << ccap_string(caps) << " on " << *in + dout(10) << "process_cap_update client." << client << " " << ccap_string(caps) << " on " << *in << (mdr ? "" : " (DEFERRED, no mdr)") << dendl; @@ -2870,7 +2870,7 @@ void Locker::handle_client_lease(MClientLease *m) // replica and lock ClientLease *l = dn->get_client_lease(client); if (!l) { - dout(7) << "handle_client_lease didn't have lease for client" << client << " of " << *dn << dendl; + dout(7) << "handle_client_lease didn't have lease for client." << client << " of " << *dn << dendl; m->put(); return; } @@ -2881,7 +2881,7 @@ void Locker::handle_client_lease(MClientLease *m) if (l->seq != m->get_seq()) { dout(7) << "handle_client_lease release - seq " << l->seq << " != provided " << m->get_seq() << dendl; } else { - dout(7) << "handle_client_lease client" << client + dout(7) << "handle_client_lease client." << client << " on " << *dn << dendl; dn->remove_client_lease(l, this); } @@ -2890,7 +2890,7 @@ void Locker::handle_client_lease(MClientLease *m) case CEPH_MDS_LEASE_RENEW: { - dout(7) << "handle_client_lease client" << client + dout(7) << "handle_client_lease client." << client << " renew on " << *dn << dendl; int pool = 1; // fixme.. do something smart! m->h.duration_ms = (int)(1000 * mdcache->client_lease_durations[pool]); |