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

mark osd down and then up again in separate epochs

Browse Source 
git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1518 29311d96-e01e-0410-9327-a35deaab8ce9
This commit is contained in:
sageweil 2007-07-17 20:49:55 +00:00
parent 150bbe9139
commit 61bc6f6a95
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
trunk/ceph/mon/OSDMonitor.cc
View File

@ -517,23 +517,25 @@ bool OSDMonitor::prepare_boot(MOSDBoot *m)
// already up? mark down first?
if (osdmap.is_up(from)) {
dout(7) << "prepare_boot was up, first marking down " << osdmap.get_inst(from) << endl;
assert(osdmap.get_inst(from) != m->inst); // preproces should have caught it
// mark previous guy down
pending_inc.new_down[from] = osdmap.osd_inst[from];
paxos->wait_for_commit(new C_RetryMessage(this, m));
} else {
// mark new guy up.
down_pending_out.erase(from); // if any
pending_inc.new_up[from] = m->inst;
// mark in?
if (osdmap.out_osds.count(from))
pending_inc.new_in.push_back(from);
// wait
paxos->wait_for_commit(new C_Booted(this, m));
}
// mark new guy up.
down_pending_out.erase(from); // if any
pending_inc.new_up[from] = m->inst;
// mark in?
if (osdmap.out_osds.count(from))
pending_inc.new_in.push_back(from);
// wait
paxos->wait_for_commit(new C_Booted(this, m));
return true;
}