mirror of
https://github.com/minio/minio.git
synced 2024-12-25 06:35:56 -05:00
fix: remove DriveOPTimeout for REST callers as they don't work properly (#19873)
Go's net/http is notoriously difficult to have a streaming deadlines per READ/WRITE on the net.Conn if we add them they interfere with the Go's internal requirements for a HTTP connection. Remove this support for now fixes #19853
This commit is contained in:
parent
d274566463
commit
d5e48cfd65
7
.github/workflows/mint.yml
vendored
7
.github/workflows/mint.yml
vendored
@ -55,9 +55,10 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
${GITHUB_WORKSPACE}/.github/workflows/run-mint.sh "erasure" "minio" "minio123" "${{ steps.vars.outputs.sha_short }}"
|
${GITHUB_WORKSPACE}/.github/workflows/run-mint.sh "erasure" "minio" "minio123" "${{ steps.vars.outputs.sha_short }}"
|
||||||
|
|
||||||
- name: resiliency
|
# FIXME: renable this back when we have a valid way to add deadlines for PUT()s (internode CreateFile)
|
||||||
run: |
|
# - name: resiliency
|
||||||
${GITHUB_WORKSPACE}/.github/workflows/run-mint.sh "resiliency" "minio" "minio123" "${{ steps.vars.outputs.sha_short }}"
|
# run: |
|
||||||
|
# ${GITHUB_WORKSPACE}/.github/workflows/run-mint.sh "resiliency" "minio" "minio123" "${{ steps.vars.outputs.sha_short }}"
|
||||||
|
|
||||||
- name: The job must cleanup
|
- name: The job must cleanup
|
||||||
if: ${{ always() }}
|
if: ${{ always() }}
|
||||||
|
@ -8,6 +8,10 @@ import (
|
|||||||
"github.com/minio/minio/internal/logger"
|
"github.com/minio/minio/internal/logger"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func proxyLogIf(ctx context.Context, err error, errKind ...interface{}) {
|
||||||
|
logger.LogIf(ctx, "proxy", err, errKind...)
|
||||||
|
}
|
||||||
|
|
||||||
func replLogIf(ctx context.Context, err error, errKind ...interface{}) {
|
func replLogIf(ctx context.Context, err error, errKind ...interface{}) {
|
||||||
logger.LogIf(ctx, "replication", err, errKind...)
|
logger.LogIf(ctx, "replication", err, errKind...)
|
||||||
}
|
}
|
||||||
|
@ -415,7 +415,8 @@ func serverHandleCmdArgs(ctxt serverCtxt) {
|
|||||||
|
|
||||||
globalTCPOptions = xhttp.TCPOptions{
|
globalTCPOptions = xhttp.TCPOptions{
|
||||||
UserTimeout: int(ctxt.UserTimeout.Milliseconds()),
|
UserTimeout: int(ctxt.UserTimeout.Milliseconds()),
|
||||||
DriveOPTimeout: globalDriveConfig.GetOPTimeout,
|
// FIXME: Bring this back when we have valid way to handle deadlines
|
||||||
|
// DriveOPTimeout: globalDriveConfig.GetOPTimeout,
|
||||||
Interface: ctxt.Interface,
|
Interface: ctxt.Interface,
|
||||||
SendBufSize: ctxt.SendBufSize,
|
SendBufSize: ctxt.SendBufSize,
|
||||||
RecvBufSize: ctxt.RecvBufSize,
|
RecvBufSize: ctxt.RecvBufSize,
|
||||||
@ -430,7 +431,7 @@ func serverHandleCmdArgs(ctxt serverCtxt) {
|
|||||||
RoundTripper: globalRemoteTargetTransport,
|
RoundTripper: globalRemoteTargetTransport,
|
||||||
Logger: func(err error) {
|
Logger: func(err error) {
|
||||||
if err != nil && !errors.Is(err, context.Canceled) {
|
if err != nil && !errors.Is(err, context.Canceled) {
|
||||||
replLogIf(GlobalContext, err)
|
proxyLogIf(GlobalContext, err)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user