mirror of
https://github.com/minio/minio.git
synced 2025-07-16 20:31:55 -04:00
move from 503 -> 499 for disconnected clients
This commit is contained in:
parent
5aff310b80
commit
23f11cec58
@ -234,6 +234,7 @@ const (
|
|||||||
ErrServerNotInitialized
|
ErrServerNotInitialized
|
||||||
ErrOperationTimedOut
|
ErrOperationTimedOut
|
||||||
ErrOperationMaxedOut
|
ErrOperationMaxedOut
|
||||||
|
ErrClientDisconnected
|
||||||
ErrInvalidRequest
|
ErrInvalidRequest
|
||||||
// MinIO storage class error codes
|
// MinIO storage class error codes
|
||||||
ErrInvalidStorageClass
|
ErrInvalidStorageClass
|
||||||
@ -1216,6 +1217,11 @@ var errorCodes = errorCodeMap{
|
|||||||
Description: "A timeout occurred while trying to lock a resource, please reduce your request rate",
|
Description: "A timeout occurred while trying to lock a resource, please reduce your request rate",
|
||||||
HTTPStatusCode: http.StatusServiceUnavailable,
|
HTTPStatusCode: http.StatusServiceUnavailable,
|
||||||
},
|
},
|
||||||
|
ErrClientDisconnected: {
|
||||||
|
Code: "ClientDisconnected",
|
||||||
|
Description: "Client disconnected before response was ready",
|
||||||
|
HTTPStatusCode: 499, // No official code, use nginx value.
|
||||||
|
},
|
||||||
ErrOperationMaxedOut: {
|
ErrOperationMaxedOut: {
|
||||||
Code: "SlowDown",
|
Code: "SlowDown",
|
||||||
Description: "A timeout exceeded while waiting to proceed with the request, please reduce your request rate",
|
Description: "A timeout exceeded while waiting to proceed with the request, please reduce your request rate",
|
||||||
@ -1742,6 +1748,16 @@ func toAPIErrorCode(ctx context.Context, err error) (apiErr APIErrorCode) {
|
|||||||
return ErrNone
|
return ErrNone
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Only return ErrClientDisconnected if the provided context is actually canceled.
|
||||||
|
// This way downstream context.Canceled will still report ErrOperationTimedOut
|
||||||
|
select {
|
||||||
|
case <-ctx.Done():
|
||||||
|
if ctx.Err() == context.Canceled {
|
||||||
|
return ErrClientDisconnected
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
|
||||||
switch err {
|
switch err {
|
||||||
case errInvalidArgument:
|
case errInvalidArgument:
|
||||||
apiErr = ErrAdminInvalidArgument
|
apiErr = ErrAdminInvalidArgument
|
||||||
|
Loading…
x
Reference in New Issue
Block a user