jrushford commented on a change in pull request #7809:
URL: https://github.com/apache/trafficserver/pull/7809#discussion_r668879187
##########
File path: iocore/net/UnixNet.cc
##########
@@ -507,27 +507,24 @@ NetHandler::waitForActivity(ink_hrtime timeout)
if (cop_list.in(ne)) {
cop_list.remove(ne);
}
- if (get_ev_events(pd, x) & (EVENTIO_READ | EVENTIO_ERROR)) {
+ int flags = get_ev_events(pd, x);
+ if (flags & (EVENTIO_ERROR)) {
+ ne->set_error_from_socket();
+ }
+ if (flags & (EVENTIO_READ)) {
ne->read.triggered = 1;
if (!read_ready_list.in(ne)) {
read_ready_list.enqueue(ne);
- } else if (get_ev_events(pd, x) & EVENTIO_ERROR) {
- // check for unhandled epoll events that should be handled
- Debug("iocore_net_main", "Unhandled epoll event on read: 0x%04x
read.enabled=%d closed=%d read.netready_queue=%d",
- get_ev_events(pd, x), ne->read.enabled, ne->closed,
read_ready_list.in(ne));
}
}
- if (get_ev_events(pd, x) & (EVENTIO_WRITE | EVENTIO_ERROR)) {
+ if (flags & (EVENTIO_WRITE)) {
ne->write.triggered = 1;
if (!write_ready_list.in(ne)) {
write_ready_list.enqueue(ne);
- } else if (get_ev_events(pd, x) & EVENTIO_ERROR) {
- // check for unhandled epoll events that should be handled
- Debug("iocore_net_main", "Unhandled epoll event on write: 0x%04x
write.enabled=%d closed=%d write.netready_queue=%d",
- get_ev_events(pd, x), ne->write.enabled, ne->closed,
write_ready_list.in(ne));
}
- } else if (!(get_ev_events(pd, x) & EVENTIO_READ)) {
+ } else if (!(flags & (EVENTIO_READ))) {
Debug("iocore_net_main", "Unhandled epoll event: 0x%04x",
get_ev_events(pd, x));
+ ink_release_assert(false);
Review comment:
@shinrich we're sending production traffic through 9.1.x and seeing it
crash here with the assertion, line 527.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
