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>

diff --cc src/mon/Monitor.cc
index 369f7c48c157e79b53b50d3db1cbced4dbc9452b,ec1eaa298df0114b180168fa37c255ec1dfe204d..f52788bc64fddf3f77dbb675025184c1504851ad
--- 1/src/mon/Monitor.cc
--- 2/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();

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/osd/ECBackend.cc
Simple merge

diff --cc src/osd/ECMsgTypes.cc
Simple merge

diff --cc src/osd/osd_types.cc
Simple merge