RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-03 23:10:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon: make 'mon add ...' work

Browse Source
This commit is contained in:
Sage Weil 2009-10-15 12:10:31 -07:00
parent 3ce86d04ed
commit 15fc0c30f8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mon/MonmapMonitor.cc
View File

@ -125,7 +125,9 @@ bool MonmapMonitor::preprocess_command(MMonCommand *m)
} else
ss << "specify mon number or *";
}
}
}
else if (m->cmd[1] == "add")
return false;
}
if (r != -1) {
@ -159,7 +161,7 @@ bool MonmapMonitor::prepare_command(MMonCommand *m)
string rs;
int err = -EINVAL;
if (m->cmd.size() > 1) {
if (m->cmd.size() == 2 && m->cmd[1] == "add") {
if (m->cmd.size() == 3 && m->cmd[1] == "add") {
entity_addr_t addr;
parse_ip_port(m->cmd[2].c_str(), addr);
bufferlist rdata;
@ -171,7 +173,7 @@ bool MonmapMonitor::prepare_command(MMonCommand *m)
pending_map.add(addr);
pending_map.last_changed = g_clock.now();
ss << "added mon " << addr;
ss << "added mon" << (pending_map.size()-1) << " at " << addr;
getline(ss, rs);
paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, paxos->get_version()));
return true;