From: Joao Eduardo Luis <joao.luis@inktank.com>
Date: Tue, 17 Jun 2014 16:27:55 +0000 (+0100)
Subject: mon: Monitor: complex code deduplication algorithm applied to tick()
X-Git-Tag: v0.83~66^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7b580a2f02fbe9b42159a1a9a96e53c95bf5a9c6;p=ceph.git

mon: Monitor: complex code deduplication algorithm applied to tick()

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index ca55a93e351..ed1d595b927 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();