aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chrislusf@users.noreply.github.com>2025-10-08 21:18:41 -0700
committerGitHub <noreply@github.com>2025-10-08 21:18:41 -0700
commit8bf727d225067b1078673dc0101cf9e966cf40eb (patch)
tree4b4ab1b2deb911ea81374417592775589b44db60
parent7ee99408337dda8e036638f5595d282d516ec5c9 (diff)
downloadseaweedfs-8bf727d225067b1078673dc0101cf9e966cf40eb.tar.xz
seaweedfs-8bf727d225067b1078673dc0101cf9e966cf40eb.zip
Fix #7060: Return 400 InvalidRequest instead of 500 for context canceled errors (#7309)
When a client cancels an HTTP request (e.g., connection timeout, client disconnect), the context gets canceled and propagates through the system as "context canceled" or "code = Canceled" errors. These errors were being treated as internal server errors (500) when they should be treated as client errors (400). Problem: - Client cancels request or connection times out - Filer fails to assign file ID with "context canceled" - S3 API returns HTTP 500 Internal Server Error - This is incorrect - it's a client issue, not a server issue Solution: Added detection for context canceled errors in filerErrorToS3Error(): - Detects "context canceled" and "code = Canceled" in error strings - Returns ErrInvalidRequest (HTTP 400) instead of ErrInternalError (500) - Properly attributes the error to the client, not the server Changes: - Updated filerErrorToS3Error() to detect context cancellation - Added test cases for both gRPC and simple context canceled errors - Maintains existing error handling for other error types This ensures: - Clients get appropriate 4xx error codes for their canceled requests - Server metrics correctly reflect that these are client issues - Monitoring/alerting won't trigger false positives for client timeouts Fixes #7060
-rw-r--r--weed/s3api/s3api_object_handlers_put.go3
-rw-r--r--weed/s3api/s3api_object_handlers_put_test.go10
2 files changed, 13 insertions, 0 deletions
diff --git a/weed/s3api/s3api_object_handlers_put.go b/weed/s3api/s3api_object_handlers_put.go
index cbd8da54f..cc2fb3dfd 100644
--- a/weed/s3api/s3api_object_handlers_put.go
+++ b/weed/s3api/s3api_object_handlers_put.go
@@ -383,6 +383,9 @@ func filerErrorToS3Error(errString string) s3err.ErrorCode {
switch {
case errString == constants.ErrMsgBadDigest:
return s3err.ErrBadDigest
+ case strings.Contains(errString, "context canceled") || strings.Contains(errString, "code = Canceled"):
+ // Client canceled the request, return client error not server error
+ return s3err.ErrInvalidRequest
case strings.HasPrefix(errString, "existing ") && strings.HasSuffix(errString, "is a directory"):
return s3err.ErrExistingObjectIsDirectory
case strings.HasSuffix(errString, "is a file"):
diff --git a/weed/s3api/s3api_object_handlers_put_test.go b/weed/s3api/s3api_object_handlers_put_test.go
index 87b874e1f..9144e2cee 100644
--- a/weed/s3api/s3api_object_handlers_put_test.go
+++ b/weed/s3api/s3api_object_handlers_put_test.go
@@ -19,6 +19,16 @@ func TestFilerErrorToS3Error(t *testing.T) {
expectedErr: s3err.ErrBadDigest,
},
{
+ name: "Context canceled error",
+ errString: "rpc error: code = Canceled desc = context canceled",
+ expectedErr: s3err.ErrInvalidRequest,
+ },
+ {
+ name: "Context canceled error (simple)",
+ errString: "context canceled",
+ expectedErr: s3err.ErrInvalidRequest,
+ },
+ {
name: "Directory exists error",
errString: "existing /path/to/file is a directory",
expectedErr: s3err.ErrExistingObjectIsDirectory,