From 4f402cb45e85c55794c35a1303850611ef91d473 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Mon, 19 Apr 2010 14:32:36 -0700 Subject: [PATCH] mds: rename send_message_client to send_message_client_counted --- src/mds/Locker.cc | 16 ++++++++-------- src/mds/MDCache.cc | 6 +++--- src/mds/MDS.cc | 14 +++++++------- src/mds/MDS.h | 6 +++--- src/mds/Migrator.cc | 2 +- src/mds/Server.cc | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index 2d17c129f7d80..9a7d1ef60653a 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -1036,7 +1036,7 @@ void Locker::file_update_finish(CInode *in, Mutation *mut, bool share, client_t mut->apply(); if (ack) - mds->send_message_client(ack, client); + mds->send_message_client_counted(ack, client); drop_locks(mut); mut->cleanup(); @@ -1222,7 +1222,7 @@ bool Locker::issue_caps(CInode *in, Capability *only_cap) cap->get_mseq()); in->encode_cap_message(m, cap); - mds->send_message_client(m, it->first); + mds->send_message_client_counted(m, it->first); } } @@ -1248,7 +1248,7 @@ void Locker::issue_truncate(CInode *in) cap->pending(), cap->wanted(), 0, cap->get_mseq()); in->encode_cap_message(m, cap); - mds->send_message_client(m, it->first); + mds->send_message_client_counted(m, it->first); } // should we increase max_size? @@ -1579,7 +1579,7 @@ void Locker::share_inode_max_size(CInode *in) cap->pending(), cap->wanted(), 0, cap->get_mseq()); in->encode_cap_message(m, cap); - mds->send_message_client(m, client); + mds->send_message_client_counted(m, client); } } } @@ -1709,7 +1709,7 @@ void Locker::handle_client_caps(MClientCaps *m) } if (!_do_cap_update(in, cap, m->get_dirty(), follows, m, ack)) { if (ack) - mds->send_message_client(ack, m->get_connection()); + mds->send_message_client_counted(ack, m->get_connection()); eval_cap_gather(in); } @@ -1774,7 +1774,7 @@ void Locker::handle_client_caps(MClientCaps *m) } else { // no update, ack now. if (ack) - mds->send_message_client(ack, m->get_connection()); + mds->send_message_client_counted(ack, m->get_connection()); bool did_issue = eval(in, CEPH_CAP_LOCKS); if (!did_issue && (cap->wanted() & ~cap->pending())) @@ -2168,7 +2168,7 @@ void Locker::handle_client_lease(MClientLease *m) now += mdcache->client_lease_durations[pool]; mdcache->touch_client_lease(l, pool, now); - mds->send_message_client(m, m->get_connection()); + mds->send_message_client_counted(m, m->get_connection()); } break; @@ -2262,7 +2262,7 @@ void Locker::revoke_client_leases(SimpleLock *lock) // i should also revoke the dir ICONTENT lease, if they have it! CInode *diri = dn->get_dir()->get_inode(); - mds->send_message_client(new MClientLease(CEPH_MDS_LEASE_REVOKE, l->seq, + mds->send_message_client_counted(new MClientLease(CEPH_MDS_LEASE_REVOKE, l->seq, mask, diri->ino(), diri->first, CEPH_NOSNAP, diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 6d5f2056b863e..11a2443e9616c 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -4028,7 +4028,7 @@ void MDCache::send_snaps(map& splits) << " split " << p->second->head.split << " inos " << p->second->split_inos << dendl; - mds->send_message_client(p->second, session->inst); + mds->send_message_client_counted(p->second, session->inst); } else { dout(10) << " no session for client" << p->first << dendl; p->second->put(); @@ -4115,7 +4115,7 @@ void MDCache::do_cap_import(Session *session, CInode *in, Capability *cap) cap->get_mseq()); in->encode_cap_message(reap, cap); realm->build_snap_trace(reap->snapbl); - mds->send_message_client(reap, session->inst); + mds->send_message_client_counted(reap, session->inst); } else { dout(10) << "do_cap_import missing past snap parents, delaying " << session->inst.name << " mseq " << cap->get_mseq() << " on " << *in << dendl; @@ -4229,7 +4229,7 @@ void MDCache::finish_snaprealm_reconnect(client_t client, SnapRealm *realm, snap if (session) { MClientSnap *snap = new MClientSnap(CEPH_SNAP_OP_UPDATE); realm->build_snap_trace(snap->bl); - mds->send_message_client(snap, session->inst); + mds->send_message_client_counted(snap, session->inst); } else { dout(10) << " ...or not, no session for this client!" << dendl; } diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc index bcaaf0ad853fc..a4c748758ca6f 100644 --- a/src/mds/MDS.cc +++ b/src/mds/MDS.cc @@ -369,29 +369,29 @@ void MDS::forward_message_mds(Message *m, int mds) -void MDS::send_message_client(Message *m, client_t client) +void MDS::send_message_client_counted(Message *m, client_t client) { if (sessionmap.have_session(entity_name_t::CLIENT(client.v))) { version_t seq = sessionmap.inc_push_seq(client); - dout(10) << "send_message_client client" << client << " seq " << seq << " " << *m << dendl; + dout(10) << "send_message_client_counted client" << client << " seq " << seq << " " << *m << dendl; messenger->send_message(m, sessionmap.get_session(entity_name_t::CLIENT(client.v))->inst); } else { - dout(10) << "send_message_client no session for client" << client << " " << *m << dendl; + dout(10) << "send_message_client_counted no session for client" << client << " " << *m << dendl; } } -void MDS::send_message_client(Message *m, entity_inst_t clientinst) +void MDS::send_message_client_counted(Message *m, entity_inst_t clientinst) { version_t seq = sessionmap.inc_push_seq(clientinst.name.num()); - dout(10) << "send_message_client " << clientinst.name << " seq " << seq << " " << *m << dendl; + dout(10) << "send_message_client_counted " << clientinst.name << " seq " << seq << " " << *m << dendl; messenger->send_message(m, clientinst); } -void MDS::send_message_client(Message *m, Connection *con) +void MDS::send_message_client_counted(Message *m, Connection *con) { Session *session = (Session *)con->get_priv(); version_t seq = session->inc_push_seq(); - dout(10) << "send_message_client " << session->inst.name << " seq " + dout(10) << "send_message_client_counted " << session->inst.name << " seq " << seq << " " << *m << dendl; messenger->send_message(m, con); } diff --git a/src/mds/MDS.h b/src/mds/MDS.h index 12a2821731587..06e76c704da55 100644 --- a/src/mds/MDS.h +++ b/src/mds/MDS.h @@ -331,9 +331,9 @@ class MDS : public Dispatcher { void send_message_mds(Message *m, int mds); void forward_message_mds(Message *req, int mds); - void send_message_client(Message *m, client_t client); - void send_message_client(Message *m, entity_inst_t clientinst); - void send_message_client(Message *m, Connection *con); + void send_message_client_counted(Message *m, client_t client); + void send_message_client_counted(Message *m, entity_inst_t clientinst); + void send_message_client_counted(Message *m, Connection *con); void send_message(Message *m, Connection *c); // start up, shutdown diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc index 493c0ab54cacb..48f5330118640 100644 --- a/src/mds/Migrator.cc +++ b/src/mds/Migrator.cc @@ -918,7 +918,7 @@ void Migrator::finish_export_inode_caps(CInode *in) cap->get_cap_id(), cap->get_last_seq(), cap->pending(), cap->wanted(), 0, cap->get_mseq()); - mds->send_message_client(m, it->first); + mds->send_message_client_counted(m, it->first); } in->clear_client_caps(); } diff --git a/src/mds/Server.cc b/src/mds/Server.cc index b921e5d06225f..9195a845df990 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -605,7 +605,7 @@ void Server::handle_client_reconnect(MClientReconnect *m) fake_inode.ino = p->first; MClientCaps *stale = new MClientCaps(CEPH_CAP_OP_EXPORT, p->first, 0, 0, 0); //stale->head.migrate_seq = 0; // FIXME ****** - mds->send_message_client(stale, m->get_connection()); + mds->send_message_client_counted(stale, m->get_connection()); // add to cap export list. mdcache->rejoin_export_caps(p->first, from, p->second); -- 2.39.5