mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-08-29 20:27:02 +00:00
Chris LuandGitHub
60893c5ef3
* util, pb: classify a filer error by the status the server sent DoSeaweedListWithSnapshot wrapped a failed ListEntries with %v, dropping the gRPC status, so IsTransientError fell back to matching substrings against a message that now held the caller's path. Keep the status with %w and let it decide, reading the server's own text rather than the wrapper's. Claude-Session: https://claude.ai/code/session_01BjDWtZsCoZY6x4pdDmGWxU * s3: keep the bucket and prefix out of the list retry decision A bucket named transport, or a prefix under logs/unavailable/, made a PermissionDenied listing look transient and got it retried; a key holding the not-found sentence suppressed a retry that should have run. Both checks now read the filer's status, and only fall back to the text when there is none. Claude-Session: https://claude.ai/code/session_01BjDWtZsCoZY6x4pdDmGWxU * filer, s3: classify a delete failure before the path is wrapped into it The filer put the non-empty-folder marker behind its own "delete directory %s" wrapper and the gateway matched it as a substring, so a key named after the marker turned a real delete failure into the demote-the-marker no-op and the request answered 204. Keep the marker leading the message that crosses the wire, turn it back into a sentinel where the response is read, and match that. Claude-Session: https://claude.ai/code/session_01BjDWtZsCoZY6x4pdDmGWxU
44 lines
1.6 KiB
Go
44 lines
1.6 KiB
Go
package s3api
|
|
|
|
import (
|
|
"errors"
|
|
"strings"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/s3err"
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
"google.golang.org/grpc/codes"
|
|
)
|
|
|
|
// isFilerNotFound reports whether a filer error is a not-found.
|
|
// Unlike lookups (normalized in filer_pb.LookupEntry), list and cache errors
|
|
// cross gRPC as raw status errors, so the sentinel survives as codes.NotFound
|
|
// or only as text. The text is matched last and only on what the filer itself
|
|
// said, since callers wrap these errors with a path the client chose.
|
|
func isFilerNotFound(err error) bool {
|
|
if err == nil {
|
|
return false
|
|
}
|
|
if errors.Is(err, filer_pb.ErrNotFound) {
|
|
return true
|
|
}
|
|
if st, ok := util.ServerStatus(err); ok {
|
|
return st.Code() == codes.NotFound || strings.Contains(st.Message(), filer_pb.ErrNotFound.Error())
|
|
}
|
|
return strings.Contains(err.Error(), filer_pb.ErrNotFound.Error())
|
|
}
|
|
|
|
// ErrorHandlers provide common error handling patterns for S3 API operations
|
|
|
|
// handleMultipartError logs an error and returns the standard multipart error format
|
|
func handleMultipartError(operation string, err error, errorCode s3err.ErrorCode) (interface{}, s3err.ErrorCode) {
|
|
glog.Errorf("Failed to %s: %v", operation, err)
|
|
return nil, errorCode
|
|
}
|
|
|
|
// handleMultipartInternalError is a convenience wrapper for internal errors in multipart operations
|
|
func handleMultipartInternalError(operation string, err error) (interface{}, s3err.ErrorCode) {
|
|
return handleMultipartError(operation, err, s3err.ErrInternalError)
|
|
}
|