RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 14:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

OSDMonitor: factor out check_source helper

Browse Source 
Signed-off-by: Samuel Just <sam.just@inktank.com>
This commit is contained in:
Samuel Just 2013-03-20 14:30:29 -07:00
parent b8929c4262
commit edebb341c2
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/mon/OSDMonitor.cc
View File

@ -625,25 +625,33 @@ bool OSDMonitor::should_propose(double& delay)
// failure --
bool OSDMonitor::check_source(PaxosServiceMessage *m, uuid_d fsid) {
// check permissions
MonSession *session = m->get_session();
if (!session)
return true;
if (!session->caps.check_privileges(PAXOS_OSDMAP, MON_CAP_X)) {
dout(0) << "got osdmap change request from entity with insufficient caps "
<< session->caps << dendl;
return true;
}
if (fsid != mon->monmap->fsid) {
dout(0) << "check_source: on fsid " << fsid
<< " != " << mon->monmap->fsid << dendl;
return true;
}
return false;
}
bool OSDMonitor::preprocess_failure(MOSDFailure *m)
{
// who is target_osd
int badboy = m->get_target().name.num();
// check permissions
MonSession *session = m->get_session();
if (!session)
if (check_source(m, m->fsid))
goto didit;
if (!session->caps.check_privileges(PAXOS_OSDMAP, MON_CAP_X)) {
dout(0) << "got MOSDFailure from entity with insufficient caps "
<< session->caps << dendl;
goto didit;
}
if (m->fsid != mon->monmap->fsid) {
dout(0) << "preprocess_failure on fsid " << m->fsid << " != " << mon->monmap->fsid << dendl;
goto didit;
}
// first, verify the reporting host is valid
if (m->get_orig_source().is_osd()) {

2
src/mon/OSDMonitor.h
View File

@ -171,6 +171,8 @@ private:
void remove_redundant_pg_temp();
void remove_down_pg_temp();
int reweight_by_utilization(int oload, std::string& out_str);
bool check_source(PaxosServiceMessage *m, uuid_d fsid);
bool preprocess_failure(class MOSDFailure *m);
bool prepare_failure(class MOSDFailure *m);