]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mon/Paxos: do paxos refresh in finish_proposal; and refactor
authorSage Weil <sage@inktank.com>
Sun, 2 Jun 2013 23:57:11 +0000 (16:57 -0700)
committerSage Weil <sage@inktank.com>
Wed, 19 Jun 2013 18:27:04 +0000 (11:27 -0700)
commita42d7582f816b45f5d19c393fd45447555e78fdd
treef6e871039fb66613dca87efd208b16edecd009dc
parent2fccb300bdf6ffd44db3462eb05115da11322ed4
mon/Paxos: do paxos refresh in finish_proposal; and refactor

Do the paxos refresh inside finish_proposal, ordered *after* the leader
assertion so that MonmapMonitor::update_from_paxos() calling bootstrap()
does not kill us.

Also, remove unnecessary finish_queued_proposal() and move the logic inline
where the bad leader assertion is obvious.

Signed-off-by: Sage Weil <sage@inktank.com>
src/mon/Paxos.cc
src/mon/Paxos.h