summaryrefslogtreecommitdiff
path: root/src/mon/PaxosService.h
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-07-21 17:16:10 -0700
committerSage Weil <sage@inktank.com>2013-07-21 17:16:10 -0700
commitc4193013d5e6fdf480fa9e9b14fec5c748c7f87d (patch)
treef65f1eea44d5ec7cf95efd9ee15f125f3a28ee11 /src/mon/PaxosService.h
parent6d386bda93099dc2e450cde7139487b5983f8889 (diff)
parent73b4003f6545ae1ed9efd3abc3b25bd3ebd73c46 (diff)
downloadceph-wip-5672.tar.gz
Merge remote-tracking branch 'gh/next' into wip-5672wip-5672
Diffstat (limited to 'src/mon/PaxosService.h')
-rw-r--r--src/mon/PaxosService.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mon/PaxosService.h b/src/mon/PaxosService.h
index a5761d19ad8..74d5a90494c 100644
--- a/src/mon/PaxosService.h
+++ b/src/mon/PaxosService.h
@@ -438,8 +438,9 @@ public:
/**
* This is called when the Paxos state goes to active.
*
- * @remarks It's a courtesy method, in case the class implementing this
- * service has anything it wants/needs to do at that time.
+ * On the peon, this is after each election.
+ * On the leader, this is after each election, *and* after each completed
+ * proposal.
*
* @note This function may get called twice in certain recovery cases.
*/