mirror of
https://github.com/ceph/ceph
synced 2025-04-20 06:15:42 +00:00
mon: remove dead 'setmap' code
Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
parent
deb25e00f2
commit
6d292397aa
@ -1408,24 +1408,6 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
|
|||||||
paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, paxos->get_version()));
|
paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, paxos->get_version()));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
/*else if (m->cmd[1] == "setmap" && m->cmd.size() == 3) {
|
|
||||||
OSDMap map;
|
|
||||||
map.decode(m->get_data());
|
|
||||||
epoch_t e = atoi(m->cmd[2].c_str());
|
|
||||||
if (ceph_fsid_compare(&map.fsid, &mon->monmap->fsid) == 0) {
|
|
||||||
if (pending_inc.epoch == e) {
|
|
||||||
map.set_epoch(pending_inc.epoch); // make sure epoch is correct
|
|
||||||
map.encode(pending_inc.fullmap);
|
|
||||||
string rs = "set osd map";
|
|
||||||
paxos->wait_for_commit(new Monitor::C_Command(mon, m, 0, rs, paxos->get_version()));
|
|
||||||
return true;
|
|
||||||
} else
|
|
||||||
ss << "next osdmap epoch " << pending_inc.epoch << " != " << e;
|
|
||||||
} else
|
|
||||||
ss << "osdmap fsid " << map.fsid << " does not match monitor fsid " << mon->monmap->fsid;
|
|
||||||
err = -EINVAL;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
else if (m->cmd[1] == "setmaxosd" && m->cmd.size() > 2) {
|
else if (m->cmd[1] == "setmaxosd" && m->cmd.size() > 2) {
|
||||||
int newmax = atoi(m->cmd[2].c_str());
|
int newmax = atoi(m->cmd[2].c_str());
|
||||||
if (newmax < osdmap.crush.get_max_devices()) {
|
if (newmax < osdmap.crush.get_max_devices()) {
|
||||||
|
Loading…
Reference in New Issue
Block a user