]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mon/PaxosService: consolidate resetting in restart()
authorSage Weil <sage@inktank.com>
Mon, 15 Jul 2013 19:56:26 +0000 (12:56 -0700)
committerSage Weil <sage@inktank.com>
Mon, 15 Jul 2013 20:42:53 +0000 (13:42 -0700)
commit1fc85acdb82919863ed6aa3cd38c99b522e692a1
treeb71dfab0e9cd8ea5d1afc14b436a1ba248bbfe7a
parent7666c33a1d8e8706ca764fca12b302fa10a5a0b8
mon/PaxosService: consolidate resetting in restart()

We had duplicated code in election_finished() and restart(), and it was
incomplete.  Put it all in restart() only (the mon should have called
restart() long before the election finishes).  Note that we cannot
assert as much in election_finished() because another service may have
just cross-proposed.

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