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

Merge pull request #315 from ceph/wip-4507

Browse Source 
Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-05-22 10:15:51 -07:00
commit 2c58b790ff
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mon/PaxosService.cc
View File

@ -176,7 +176,7 @@ void PaxosService::propose_pending()
t.encode(bl);
// apply to paxos
proposing.set(1);
proposing = true;
paxos->propose_new_value(bl, new C_Committed(this));
}
@ -219,7 +219,7 @@ void PaxosService::election_finished()
discard_pending();
have_pending = false;
}
proposing.set(0);
proposing = false;
finish_contexts(g_ceph_context, waiting_for_finished_proposal, -EAGAIN);

8
src/mon/PaxosService.h
View File

@ -54,7 +54,7 @@ class PaxosService {
* If we are or have queued anything for proposal, this variable will be true
* until our proposal has been finished.
*/
atomic_t proposing;
bool proposing;
protected:
/**
@ -167,7 +167,7 @@ protected:
public:
C_Committed(PaxosService *p) : ps(p) { }
void finish(int r) {
ps->proposing.set(0);
ps->proposing = false;
if (r >= 0)
ps->_active();
else if (r == -ECANCELED || r == -EAGAIN)
@ -190,6 +190,7 @@ public:
*/
PaxosService(Monitor *mn, Paxos *p, string name)
: mon(mn), paxos(p), service_name(name),
proposing(false),
service_version(0), proposal_timer(0), have_pending(false),
trim_version(0),
last_committed_name("last_committed"),
@ -198,7 +199,6 @@ public:
mkfs_name("mkfs"),
full_version_name("full"), full_latest_name("latest")
{
proposing.set(0);
}
virtual ~PaxosService() {}
@ -486,7 +486,7 @@ public:
* @returns true if we are proposing; false otherwise.
*/
bool is_proposing() {
return ((int) proposing.read() == 1);
return proposing;
}
/**