Skip to content

Commit

Permalink
fix: dail connection return io timeout when ctx.Done happen
Browse files Browse the repository at this point in the history
  • Loading branch information
joway committed Oct 24, 2024
1 parent 8a1f559 commit 84658f7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion connection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ func TestConnectionDailTimeoutAndClose(t *testing.T) {
go func() {
defer wg.Done()
conn, err := DialConnection("tcp", address, time.Nanosecond)
Assert(t, err == nil || strings.Contains(err.Error(), "i/o timeout"))
Assert(t, err == nil || strings.Contains(err.Error(), "i/o timeout"), err)
_ = conn
}()
}
Expand Down
7 changes: 3 additions & 4 deletions net_polldesc.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,21 @@ func (pd *pollDesc) WaitWrite(ctx context.Context) (err error) {
}

select {
case <-pd.writeTrigger: // triggered by poller
case <-pd.closeTrigger: // triggered by poller
// no need to detach, since poller has done it in OnHup.
return Exception(ErrConnClosed, "by peer")
case <-pd.writeTrigger: // triggered by poller
err = nil
case <-ctx.Done(): // triggered by ctx
// deregister from poller, upper caller function will close fd
pd.detach()
err = mapErr(ctx.Err())
return mapErr(ctx.Err())
}
// double check close trigger
select {
case <-pd.closeTrigger:
return Exception(ErrConnClosed, "by peer")
default:
return err
return nil
}
}

Expand Down

0 comments on commit 84658f7

Please sign in to comment.