From 7b580a2f02fbe9b42159a1a9a96e53c95bf5a9c6 Mon Sep 17 00:00:00 2001 From: Joao Eduardo Luis Date: Tue, 17 Jun 2014 17:27:55 +0100 Subject: [PATCH] mon: Monitor: complex code deduplication algorithm applied to tick() Signed-off-by: Joao Eduardo Luis --- src/mon/Monitor.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index ca55a93e3513a..ed1d595b92729 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -3837,15 +3837,16 @@ void Monitor::tick() if (!s->until.is_zero() && s->until < now) { dout(10) << " trimming session " << s->con << " " << s->inst << " (until " << s->until << " < now " << now << ")" << dendl; - messenger->mark_down(s->con); - remove_session(s); } else if (out_for_too_long) { // boot the client Session because we've taken too long getting back in dout(10) << " trimming session " << s->con << " " << s->inst << " because we've been out of quorum too long" << dendl; - messenger->mark_down(s->con); - remove_session(s); + } else { + continue; } + + messenger->mark_down(s->con); + remove_session(s); } sync_trim_providers(); -- 2.39.5