Skip to content

Assertion in state_read_server_response_header (v7.1.0) #1629

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

Closed
scw00 wants to merge 1 commit into from
Closed

Assertion in state_read_server_response_header (v7.1.0) #1629

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
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 @@ -450,7 +450,7 @@ NetHandler::mainNetEvent(int event, Event *e)
if (cop_list.in(vc)) {
cop_list.remove(vc);
}
if (get_ev_events(pd, x) & EVENTIO_READ) {
if (get_ev_events(pd, x) & (EVENTIO_READ | EVENTIO_ERROR)) {
vc->read.triggered = 1;
if (get_ev_events(pd, x) & EVENTIO_ERROR) {
vc->read.error = 1;
Expand All @@ -466,7 +466,7 @@ NetHandler::mainNetEvent(int event, Event *e)
}
}
vc = epd->data.vc;
if (get_ev_events(pd, x) & EVENTIO_WRITE) {
if (get_ev_events(pd, x) & (EVENTIO_WRITE | EVENTIO_ERROR)) {
vc->write.triggered = 1;
if (get_ev_events(pd, x) & EVENTIO_ERROR) {
vc->write.error = 1;
Expand Down
10 changes: 8 additions & 2 deletions iocore/net/UnixNetVConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ read_from_net(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
return;
}

if (!s->enabled && vc->read.error) {
if ((!s->enabled || s->vio.ntodo() <= 0) && vc->read.error) {
int err = 0, errlen = sizeof(int);
if (getsockopt(vc->con.fd, SOL_SOCKET, SO_ERROR, &err, (socklen_t *)&errlen) == -1) {
err = errno;
Expand All @@ -276,6 +276,8 @@ read_from_net(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
if (read_signal_error(nh, vc, err) == EVENT_DONE) {
return;
}
// Clear read error if SM does not close vc [oknet]
vc->read.error = 0;
// If vc is closed or shutdown(WRITE) in last read_signal_error callback,
// or reader_cont is same as write.vio._cont.
// Then we must clear the write.error to avoid callback EVENT_ERROR to SM by write_ready_list.
Expand Down Expand Up @@ -465,7 +467,11 @@ write_to_net_io(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
if (err && err != EAGAIN && err != EINTR) {
// Here is differ to net_read_io since read_signal_error always callback first.
// NetHandler::mainNetEvent() is always handle read_ready_list first and then write_ready_list.
write_signal_error(nh, vc, err);
// We only call SM when read.error has already been cleared, or there is a write error only
// Sometimes, We can not clear read.error due to SM call do_io_read(NULL, 0, NULL) [oknet]
if (!vc->read.error || vc->read.vio._cont == nullptr) {
write_signal_error(nh, vc, err);
}
return;
}

Expand Down