From e0067a85d17a7784dcfdf1039c318db0a22bed0d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 18 Jul 2013 14:46:57 -0700 Subject: [PATCH] mon: mark_down session by con, not addr We have the ConnectionRef here; use it. This avoids generating a spurious RESET event for the connection. Signed-off-by: Sage Weil --- src/mon/Monitor.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 3ff0a6418b23f..90750dd7b1167 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -3477,16 +3477,16 @@ void Monitor::tick() continue; if (!s->until.is_zero() && s->until < now) { - dout(10) << " trimming session " << s->inst + dout(10) << " trimming session " << s->con << " " << s->inst << " (until " << s->until << " < now " << now << ")" << dendl; - messenger->mark_down(s->inst.addr); + messenger->mark_down(s->con); remove_session(s); } 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->inst - << " because we've been out of quorum too long" << dendl; - messenger->mark_down(s->inst.addr); + 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); } } -- 2.39.5