RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 09:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon/PaxosService: fix proposal waiter handling

Browse Source 
- Cancel the propsal waiters with EAGAIN on election, etc.
- Drop the wakeup helper and open-code the one caller.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
This commit is contained in:
Sage Weil 2013-03-18 21:00:06 -07:00
parent 35ab2a4189
commit 7aec13f749
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mon/PaxosService.cc
View File

@ -189,8 +189,8 @@ void PaxosService::restart()
mon->timer.cancel_event(proposal_timer);
proposal_timer = 0;
}
// ignore any callbacks waiting for us to finish our proposal
waiting_for_finished_proposal.clear();
finish_contexts(g_ceph_context, waiting_for_finished_proposal, -EAGAIN);
on_restart();
}
@ -210,8 +210,7 @@ void PaxosService::election_finished()
}
proposing.set(0);
// ignore any callbacks waiting for us to finish our proposal
waiting_for_finished_proposal.clear();
finish_contexts(g_ceph_context, waiting_for_finished_proposal, -EAGAIN);
// make sure we update our state
if (is_active())
@ -256,10 +255,11 @@ void PaxosService::_active()
}
}
/* wake people up before calling on_active(). We don't know how long we'll be
* on the service's on_active(), and we really should wake people up!
*/
wakeup_proposing_waiters();
// wake up anyone who came in while we were proposing. note that
// anyone waiting for the previous proposal to commit is no longer
// on this list; it is on Paxos's.
finish_contexts(g_ceph_context, waiting_for_finished_proposal, 0);
// NOTE: it's possible that this will get called twice if we commit
// an old paxos value. Implementations should be mindful of that.
if (is_active())
@ -275,8 +275,8 @@ void PaxosService::shutdown()
mon->timer.cancel_event(proposal_timer);
proposal_timer = 0;
}
// ignore any callbacks waiting for us to finish our proposal
waiting_for_finished_proposal.clear();
finish_contexts(g_ceph_context, waiting_for_finished_proposal, -EAGAIN);
}
void PaxosService::put_version(MonitorDBStore::Transaction *t,
@ -298,11 +298,6 @@ int PaxosService::get_version(const string& prefix, version_t ver,
return mon->store->get(get_service_name(), key, bl);
}
void PaxosService::wakeup_proposing_waiters()
{
finish_contexts(g_ceph_context, waiting_for_finished_proposal);
}
void PaxosService::trim(MonitorDBStore::Transaction *t,
version_t from, version_t to)
{

5
src/mon/PaxosService.h
View File

@ -560,11 +560,6 @@ public:
wait_for_finished_proposal(c);
}
/**
* Wakeup all the callbacks waiting for the proposal to be finished
*/
void wakeup_proposing_waiters();
/**
* @defgroup PaxosService_h_Trim
* @{