usage of deadline conn at Accept() breaks websocket (#19789)
fortunately not wired up to use, however if anyone enables deadlines for conn then sporadically MinIO startups fail.
This commit is contained in:
@@ -103,32 +103,6 @@ var ServerFlags = []cli.Flag{
|
||||
EnvVar: "MINIO_READ_HEADER_TIMEOUT",
|
||||
Hidden: true,
|
||||
},
|
||||
cli.DurationFlag{
|
||||
Name: "conn-client-read-deadline",
|
||||
Usage: "custom connection READ deadline for incoming requests",
|
||||
Hidden: true,
|
||||
EnvVar: "MINIO_CONN_CLIENT_READ_DEADLINE",
|
||||
},
|
||||
cli.DurationFlag{
|
||||
Name: "conn-client-write-deadline",
|
||||
Usage: "custom connection WRITE deadline for outgoing requests",
|
||||
Hidden: true,
|
||||
EnvVar: "MINIO_CONN_CLIENT_WRITE_DEADLINE",
|
||||
},
|
||||
cli.DurationFlag{
|
||||
Name: "conn-read-deadline",
|
||||
Usage: "custom connection READ deadline",
|
||||
Hidden: true,
|
||||
Value: 10 * time.Minute,
|
||||
EnvVar: "MINIO_CONN_READ_DEADLINE",
|
||||
},
|
||||
cli.DurationFlag{
|
||||
Name: "conn-write-deadline",
|
||||
Usage: "custom connection WRITE deadline",
|
||||
Hidden: true,
|
||||
Value: 10 * time.Minute,
|
||||
EnvVar: "MINIO_CONN_WRITE_DEADLINE",
|
||||
},
|
||||
cli.DurationFlag{
|
||||
Name: "conn-user-timeout",
|
||||
Usage: "custom TCP_USER_TIMEOUT for socket buffers",
|
||||
@@ -440,12 +414,10 @@ func serverHandleCmdArgs(ctxt serverCtxt) {
|
||||
setGlobalInternodeInterface(ctxt.Interface)
|
||||
|
||||
globalTCPOptions = xhttp.TCPOptions{
|
||||
UserTimeout: int(ctxt.UserTimeout.Milliseconds()),
|
||||
ClientReadTimeout: ctxt.ConnClientReadDeadline,
|
||||
ClientWriteTimeout: ctxt.ConnClientWriteDeadline,
|
||||
Interface: ctxt.Interface,
|
||||
SendBufSize: ctxt.SendBufSize,
|
||||
RecvBufSize: ctxt.RecvBufSize,
|
||||
UserTimeout: int(ctxt.UserTimeout.Milliseconds()),
|
||||
Interface: ctxt.Interface,
|
||||
SendBufSize: ctxt.SendBufSize,
|
||||
RecvBufSize: ctxt.RecvBufSize,
|
||||
}
|
||||
|
||||
// allow transport to be HTTP/1.1 for proxying.
|
||||
|
||||
Reference in New Issue
Block a user