From: Sage Weil <sage@inktank.com>
Date: Mon, 23 Jun 2014 15:56:39 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/wip-misc-fixes'
X-Git-Tag: v0.83~66
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c3393434cfb90746e1d78aeaace2e67e555d966c;p=ceph.git

Merge remote-tracking branch 'gh/wip-misc-fixes'

Conflicts:
	src/mon/Monitor.cc

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
---

c3393434cfb90746e1d78aeaace2e67e555d966c
diff --cc src/mon/Monitor.cc
index 369f7c48c157,ec1eaa298df0..f52788bc64fd
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@@ -3851,19 -3837,16 +3855,17 @@@ 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);
-       logger->inc(l_mon_session_trim);
-     } else if (!exited_quorum.is_zero()) {
-       if (now > (exited_quorum + 2 * g_conf->mon_lease)) {
-         // 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);
- 	logger->inc(l_mon_session_trim);
-         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;
+     } else {
+       continue;
      }
+ 
+     messenger->mark_down(s->con);
+     remove_session(s);
++    logger->inc(l_mon_session_trim);
    }
  
    sync_trim_providers();