From 6edec516bf82f2c6d622a5485a4eca7b0959d3d7 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 19 Jul 2013 16:39:47 -0700 Subject: [PATCH] Revert "mon/OSDMonitor: send_to_waiting() in on_active()" This reverts commit f06a124a7fa0717ef8c523408b31d814df57caca. On peons, on_active() is only called when we *first* become active after an election. Only on the leader is it called after each commit/update. This makes this change cause other problems (broken subscriptions on peons, in particular). We possibly should fix that, but there is also a simpler fix for the original problem we were trying to solve. Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 5c7573e4d60..95bd72c0b58 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -185,8 +185,12 @@ void OSDMonitor::update_from_paxos(bool *need_bootstrap) mon->pgmon()->check_osd_map(osdmap.epoch); } - update_logger(); + send_to_waiting(); + check_subs(); + share_map_with_random_osd(); + update_logger(); + process_failures(); // make sure our feature bits reflect the latest map @@ -294,9 +298,6 @@ void OSDMonitor::on_active() { update_logger(); - send_to_waiting(); - check_subs(); - if (thrash_map && thrash()) propose_pending(); @@ -1305,7 +1306,6 @@ void OSDMonitor::_reply_map(PaxosServiceMessage *m, epoch_t e) { dout(7) << "_reply_map " << e << " from " << m->get_orig_source_inst() - << " for " << m << dendl; send_latest(m, e); } -- 2.47.3