summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoao Eduardo Luis <joao.luis@inktank.com>2013-05-31 21:00:08 +0100
committerJoao Eduardo Luis <joao.luis@inktank.com>2013-05-31 21:00:08 +0100
commit76da347f3bb3738ae4783c17d25516b94b0fae75 (patch)
treee12c96c0f1e03d9a0e55d9ba2d965cf2cb8103cf
parent5c5b46c31bf86d0c4fda784f3afa1d427fc42e12 (diff)
downloadceph-76da347f3bb3738ae4783c17d25516b94b0fae75.tar.gz
mon: PaxosService: no need to update_from_paxos() everytime now
Given Paxos will inform the monitor it should refresh all PaxosServices upon finishing a proposal, we no longer need to keep on updating from paxos just because we *might* have something new there. Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
-rw-r--r--src/mon/Monitor.cc8
-rw-r--r--src/mon/PaxosService.cc3
2 files changed, 0 insertions, 11 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 104f45be755..e621ec74bfc 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -3325,14 +3325,6 @@ bool Monitor::_ms_dispatch(Message *m)
}
paxos->dispatch((PaxosServiceMessage*)m);
-
- // make sure service finds out about any state changes
- if (paxos->is_active()) {
- vector<PaxosService*>::iterator service_it = paxos_service.begin();
- for ( ; service_it != paxos_service.end(); ++service_it)
- (*service_it)->update_cached_versions();
- (*service_it)->update_from_paxos();
- }
}
break;
diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc
index 6cb6b93edb4..f496e2248cc 100644
--- a/src/mon/PaxosService.cc
+++ b/src/mon/PaxosService.cc
@@ -63,9 +63,6 @@ bool PaxosService::dispatch(PaxosServiceMessage *m)
return true;
}
- // make sure service has latest from paxos.
- update_from_paxos();
-
// preprocess
if (preprocess_query(m))
return true; // easy!