Skip to content

Issue 6838 Fixing the comparison in waited_enough (drain functionality) #6839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sudheerv merged 1 commit into from
Jun 1, 2020
Merged

Issue 6838 Fixing the comparison in waited_enough (drain functionality) #6839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions doc/admin-guide/files/records.config.en.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,11 @@ Thread Variables
:reloadable:

The shutdown timeout(in seconds) to apply when stopping Traffic
Server, in which ATS can initiate graceful shutdowns. It only supports
HTTP/2 graceful shutdown for now. Stopping |TS| here means sending
Server, in which ATS can initiate graceful shutdowns. In order
to effect graceful shutdown, the value specified should be greater
than 0. Value of 0 will not effect an abrupt shutdown. Abrupt
shutdowns can be achieved with out specifying --drain;
(traffic_ctl server stop /restart). Stopping |TS| here means sending
`traffic_server` a signal either by `bin/trafficserver stop` or `kill`.

.. ts:cv:: CONFIG proxy.config.thread.max_heartbeat_mseconds INT 60
Expand Down
2 changes: 1 addition & 1 deletion src/traffic_manager/traffic_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ waited_enough()
return false;
}

return (lmgmt->mgmt_shutdown_triggered_at + timeout >= time(nullptr));
return (timeout ? (lmgmt->mgmt_shutdown_triggered_at + timeout <= time(nullptr)) : false);
}

static void
Expand Down