RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-24 11:17:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon: use orig_src in clientmon, elsewhere

Browse Source
This commit is contained in:
Sage Weil 2008-07-02 20:37:07 -07:00
parent c863b1be7a
commit 71323039d1
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mon/ClientMonitor.cc
View File

@ -119,13 +119,13 @@ void ClientMonitor::encode_pending(bufferlist &bl)
bool ClientMonitor::preprocess_query(Message *m) bool ClientMonitor::preprocess_query(Message *m)
{ {
dout(10) << "preprocess_query " << *m << " from " << m->get_source_inst() << dendl; dout(10) << "preprocess_query " << *m << " from " << m->get_orig_source_inst() << dendl;
switch (m->get_type()) { switch (m->get_type()) {
case CEPH_MSG_CLIENT_MOUNT: case CEPH_MSG_CLIENT_MOUNT:
{ {
// already mounted? // already mounted?
entity_addr_t addr = m->get_source_addr(); entity_addr_t addr = m->get_orig_source_addr();
if (client_map.addr_client.count(addr)) { if (client_map.addr_client.count(addr)) {
int client = client_map.addr_client[addr]; int client = client_map.addr_client[addr];
dout(7) << " client" << client << " already mounted" << dendl; dout(7) << " client" << client << " already mounted" << dendl;
@ -138,7 +138,7 @@ bool ClientMonitor::preprocess_query(Message *m)
case CEPH_MSG_CLIENT_UNMOUNT: case CEPH_MSG_CLIENT_UNMOUNT:
{ {
// already unmounted? // already unmounted?
int client = m->get_source().num(); int client = m->get_orig_source().num();
if (client_map.client_addr.count(client) == 0) { if (client_map.client_addr.count(client) == 0) {
dout(7) << " client" << client << " not mounted" << dendl; dout(7) << " client" << client << " not mounted" << dendl;
_unmounted((MClientUnmount*)m); _unmounted((MClientUnmount*)m);
@ -157,15 +157,15 @@ bool ClientMonitor::preprocess_query(Message *m)
bool ClientMonitor::prepare_update(Message *m) bool ClientMonitor::prepare_update(Message *m)
{ {
dout(10) << "prepare_update " << *m << " from " << m->get_source_inst() << dendl; dout(10) << "prepare_update " << *m << " from " << m->get_orig_source_inst() << dendl;
switch (m->get_type()) { switch (m->get_type()) {
case CEPH_MSG_CLIENT_MOUNT: case CEPH_MSG_CLIENT_MOUNT:
{ {
entity_addr_t addr = m->get_source_addr(); entity_addr_t addr = m->get_orig_source_addr();
int client = -1; int client = -1;
if (m->get_source().is_client()) if (m->get_orig_source().is_client())
client = m->get_source().num(); client = m->get_orig_source().num();
// choose a client id // choose a client id
if (client < 0) { if (client < 0) {
@ -187,8 +187,8 @@ bool ClientMonitor::prepare_update(Message *m)
case CEPH_MSG_CLIENT_UNMOUNT: case CEPH_MSG_CLIENT_UNMOUNT:
{ {
assert(m->get_source().is_client()); assert(m->get_orig_source().is_client());
int client = m->get_source().num(); int client = m->get_orig_source().num();
assert(client_map.client_addr.count(client)); assert(client_map.client_addr.count(client));
@ -212,7 +212,7 @@ bool ClientMonitor::prepare_update(Message *m)
void ClientMonitor::_mounted(int client, MClientMount *m) void ClientMonitor::_mounted(int client, MClientMount *m)
{ {
entity_inst_t to; entity_inst_t to;
to.addr = m->get_source_addr(); to.addr = m->get_orig_source_addr();
to.name = entity_name_t::CLIENT(client); to.name = entity_name_t::CLIENT(client);
dout(10) << "_mounted client" << client << " at " << to << dendl; dout(10) << "_mounted client" << client << " at " << to << dendl;
@ -230,10 +230,10 @@ void ClientMonitor::_mounted(int client, MClientMount *m)
void ClientMonitor::_unmounted(MClientUnmount *m) void ClientMonitor::_unmounted(MClientUnmount *m)
{ {
dout(10) << "_unmounted " << m->get_source_inst() << dendl; dout(10) << "_unmounted " << m->get_orig_source_inst() << dendl;
// reply with (same) unmount message // reply with (same) unmount message
mon->messenger->send_message(m, m->get_source_inst()); mon->messenger->send_message(m, m->get_orig_source_inst());
// auto-shutdown? // auto-shutdown?
// (hack for fakesyn/newsyn, mostly) // (hack for fakesyn/newsyn, mostly)

2
src/mon/Monitor.cc
View File

@ -366,7 +366,7 @@ void Monitor::handle_mon_get_map(MMonGetMap *m)
dout(10) << "handle_mon_get_map" << dendl; dout(10) << "handle_mon_get_map" << dendl;
bufferlist bl; bufferlist bl;
monmap->encode(bl); monmap->encode(bl);
messenger->send_message(new MMonMap(bl), m->get_source_inst()); messenger->send_message(new MMonMap(bl), m->get_orig_source_inst());
delete m; delete m;
} }

2
src/mon/PaxosService.cc
View File

@ -31,7 +31,7 @@ const char *PaxosService::get_machine_name()
void PaxosService::dispatch(Message *m) void PaxosService::dispatch(Message *m)
{ {
dout(10) << "dispatch " << *m << " from " << m->get_source_inst() << dendl; dout(10) << "dispatch " << *m << " from " << m->get_orig_source_inst() << dendl;
// make sure our map is readable and up to date // make sure our map is readable and up to date
if (!paxos->is_readable()) { if (!paxos->is_readable()) {