[TS-4131] InactivityCop doesn't close active connections that have timed out

• Type: Bug
• Status: Closed
• Priority: Blocker
• Resolution: Fixed
• Fix Version/s: 6.1.0
• Component/s: Core
• Labels: regresion
• Assignee: Bryan Call
• Reporter: Chao Xu
• Created: 14/Jan/16 08:29
• Updated: 04/Feb/16 18:48
• Resolved: 22/Jan/16 17:31

Description

relative code below:

int
UnixNetVConnection::mainEvent(int event, Event *e)
{
  ink_assert(event == EVENT_IMMEDIATE || event == EVENT_INTERVAL);
  ink_assert(thread == this_ethread());
...
#ifdef INACTIVITY_TIMEOUT
  if (e == inactivity_timeout) {
    signal_event = VC_EVENT_INACTIVITY_TIMEOUT;
    signal_timeout = &inactivity_timeout;
  } else {
    ink_assert(e == active_timeout);
    signal_event = VC_EVENT_ACTIVE_TIMEOUT;
    signal_timeout = &active_timeout;
  }
#else
  if (event == EVENT_IMMEDIATE) {
    /* BZ 49408 */
    // ink_assert(inactivity_timeout_in);
    // ink_assert(next_inactivity_timeout_at < ink_get_hrtime());
    if (!inactivity_timeout_in || next_inactivity_timeout_at > Thread::get_hrtime())
      return EVENT_CONT;
    signal_event = VC_EVENT_INACTIVITY_TIMEOUT;
    signal_timeout_at = &next_inactivity_timeout_at;
  } else {
    signal_event = VC_EVENT_ACTIVE_TIMEOUT;
    signal_timeout_at = &next_activity_timeout_at;
  }
#endif

To enable InactiveCop, the INACTIVITY_TIMEOUT is not defined.

an event == EVENT_INTERVAL callback means VC_EVENT_ACTIVE_TIMEOUT.

but there are only EVENT_IMMEDIATE callbacked from InactiveCop.