Skip to content

Fix timeout checks of NetHandler::manage_active_queue() #8287

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
masaori335 merged 1 commit into from
Oct 21, 2021
Merged

Fix timeout checks of NetHandler::manage_active_queue() #8287

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
4 changes: 2 additions & 2 deletions iocore/net/UnixNet.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,8 +603,8 @@ NetHandler::manage_active_queue(NetEvent *enabling_ne, bool ignore_queue_size =
if (ne == enabling_ne) {
continue;
}
if ((ne->inactivity_timeout_in && ne->next_inactivity_timeout_at <= now) ||
(ne->active_timeout_in && ne->next_activity_timeout_at <= now)) {
Copy link
Contributor Author

@masaori335 masaori335 Aug 27, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bryancall Do you remember why inactivity_timeout_in/active_timeout_in are checked instead of next_inactivity_timeout_at/next_activity_timeout_at by a80b4f3 ?

if ((ne->next_inactivity_timeout_at && ne->next_inactivity_timeout_at <= now) ||
(ne->next_activity_timeout_at && ne->next_activity_timeout_at <= now)) {
_close_ne(ne, now, handle_event, closed, total_idle_time, total_idle_count);
}
if (ignore_queue_size == false && max_requests_per_thread_in > active_queue_size) {
Expand Down