diff options
| author | Sage Weil <sage@inktank.com> | 2013-05-31 14:30:48 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-06-24 16:16:40 -0700 |
| commit | 265212a7384399bf85e15e6978bc7543824c0e92 (patch) | |
| tree | 5e6821f36f37825bd4213641fdceae506963156d | |
| parent | 1d8662504299babec22c714662cefbb86a0acb8b (diff) | |
| download | ceph-265212a7384399bf85e15e6978bc7543824c0e92.tar.gz | |
mon: no need to refresh from _active
The refresh is done explicitly by the monitor, independent of the more
fragile PaxosService callbacks.
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit d941363d6e4249e97b64faff0e573f75e918ac0c)
| -rw-r--r-- | src/mon/PaxosService.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc index cb808036b2e..4cbdb0fee3c 100644 --- a/src/mon/PaxosService.cc +++ b/src/mon/PaxosService.cc @@ -24,11 +24,12 @@ #define dout_subsys ceph_subsys_paxos #undef dout_prefix -#define dout_prefix _prefix(_dout, mon, paxos, service_name) -static ostream& _prefix(std::ostream *_dout, Monitor *mon, Paxos *paxos, string service_name) { +#define dout_prefix _prefix(_dout, mon, paxos, service_name, get_first_committed(), get_last_committed()) +static ostream& _prefix(std::ostream *_dout, Monitor *mon, Paxos *paxos, string service_name, + version_t fc, version_t lc) { return *_dout << "mon." << mon->name << "@" << mon->rank << "(" << mon->get_state_name() - << ").paxosservice(" << service_name << ") "; + << ").paxosservice(" << service_name << " " << fc << ".." << lc << ") "; } bool PaxosService::dispatch(PaxosServiceMessage *m) @@ -255,9 +256,6 @@ void PaxosService::_active() } dout(10) << "_active" << dendl; - // pull latest from paxos - refresh(); - scrub(); // create pending state? |