RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-18 09:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon: Monitor: create logical divisions on dispatch() based on msg nature

Browse Source 
Instead of a single switch(), have multiple switch() and order them by
increasing necessity of privileges.

This patch thus divides the big switch into:

- messages not requiring auth/caps checks at all
- messages which caps shall be checked somewhere else
- messages the Monitor class needs to deal with but only require a
  client to have enough caps for the monitor to consider handling them
- messages that only a monitor is allowed to send.

Backport: firefly

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
This commit is contained in:
Joao Eduardo Luis 2014-09-12 17:21:45 +01:00 committed by Joao Eduardo Luis
parent d0113e07d8
commit 3d78285dfa
1 changed files with 81 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
src/mon/Monitor.cc
View File

@ -3200,41 +3200,30 @@ void Monitor::dispatch(MonSession *s, Message *m, const bool src_is_mon)
{
assert(m != NULL);
/* deal with all messages that do not necessarily need caps */
bool dealt_with = true;
switch (m->get_type()) {
case MSG_ROUTE:
handle_route(static_cast<MRoute*>(m));
// auth
case MSG_MON_GLOBAL_ID:
case CEPH_MSG_AUTH:
/* no need to check caps here */
paxos_service[PAXOS_AUTH]->dispatch((PaxosServiceMessage*)m);
break;
// misc
case CEPH_MSG_MON_GET_MAP:
handle_mon_get_map(static_cast<MMonGetMap*>(m));
case CEPH_MSG_PING:
handle_ping(static_cast<MPing*>(m));
break;
case CEPH_MSG_MON_GET_VERSION:
handle_get_version(static_cast<MMonGetVersion*>(m));
default:
dealt_with = false;
break;
}
if (dealt_with)
return;
case MSG_MON_COMMAND:
handle_command(static_cast<MMonCommand*>(m));
break;
case CEPH_MSG_MON_SUBSCRIBE:
/* FIXME: check what's being subscribed, filter accordingly */
handle_subscribe(static_cast<MMonSubscribe*>(m));
break;
case MSG_MON_PROBE:
handle_probe(static_cast<MMonProbe*>(m));
break;
// Sync (i.e., the new slurp, but on steroids)
case MSG_MON_SYNC:
handle_sync(static_cast<MMonSync*>(m));
break;
case MSG_MON_SCRUB:
handle_scrub(static_cast<MMonScrub*>(m));
break;
/* deal with all messages which caps should be checked somewhere else */
dealt_with = true;
switch (m->get_type()) {
// OSDs
case MSG_OSD_MARK_ME_DOWN:
@ -3255,12 +3244,6 @@ void Monitor::dispatch(MonSession *s, Message *m, const bool src_is_mon)
paxos_service[PAXOS_MDSMAP]->dispatch((PaxosServiceMessage*)m);
break;
// auth
case MSG_MON_GLOBAL_ID:
case CEPH_MSG_AUTH:
/* no need to check caps here */
paxos_service[PAXOS_AUTH]->dispatch((PaxosServiceMessage*)m);
break;
// pg
case CEPH_MSG_STATFS:
@ -3278,6 +3261,65 @@ void Monitor::dispatch(MonSession *s, Message *m, const bool src_is_mon)
paxos_service[PAXOS_LOG]->dispatch((PaxosServiceMessage*)m);
break;
default:
dealt_with = false;
break;
}
if (dealt_with)
return;
/* messages we, the Monitor class, need to deal with
* but may be sent by clients. */
dealt_with = true;
switch (m->get_type()) {
// misc
case CEPH_MSG_MON_GET_MAP:
handle_mon_get_map(static_cast<MMonGetMap*>(m));
break;
case CEPH_MSG_MON_GET_VERSION:
handle_get_version(static_cast<MMonGetVersion*>(m));
break;
case MSG_MON_COMMAND:
handle_command(static_cast<MMonCommand*>(m));
break;
case CEPH_MSG_MON_SUBSCRIBE:
/* FIXME: check what's being subscribed, filter accordingly */
handle_subscribe(static_cast<MMonSubscribe*>(m));
break;
default:
dealt_with = false;
break;
}
if (dealt_with)
return;
/* messages that should only be sent by another monitor */
dealt_with = true;
switch (m->get_type()) {
case MSG_ROUTE:
handle_route(static_cast<MRoute*>(m));
break;
case MSG_MON_PROBE:
handle_probe(static_cast<MMonProbe*>(m));
break;
// Sync (i.e., the new slurp, but on steroids)
case MSG_MON_SYNC:
handle_sync(static_cast<MMonSync*>(m));
break;
case MSG_MON_SCRUB:
handle_scrub(static_cast<MMonScrub*>(m));
break;
/* log acks are sent from a monitor we sent the MLog to, and are
never sent by clients to us. */
case MSG_LOGACK:
log_client.handle_log_ack((MLogAck*)m);
m->put();
@ -3352,15 +3394,14 @@ void Monitor::dispatch(MonSession *s, Message *m, const bool src_is_mon)
health_monitor->dispatch(static_cast<MMonHealth *>(m));
break;
case CEPH_MSG_PING:
handle_ping(static_cast<MPing*>(m));
break;
default:
dout(1) << "dropping unexpected " << *m << dendl;
m->put();
dealt_with = false;
break;
}
if (!dealt_with) {
dout(1) << "dropping unexpected " << *m << dendl;
m->put();
}
}
void Monitor::handle_ping(MPing *m)