From 7ab85c374809f4c581e469d82afa4833c2de8803 Mon Sep 17 00:00:00 2001 From: chrislu Date: Wed, 23 Jul 2025 22:20:48 -0700 Subject: [PATCH] return proper default value for locking and versioning fix https://github.com/seaweedfs/seaweedfs/issues/6971 fix https://github.com/seaweedfs/seaweedfs/issues/7028 --- weed/s3api/s3api_bucket_config.go | 2 +- weed/s3api/s3api_object_retention.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/weed/s3api/s3api_bucket_config.go b/weed/s3api/s3api_bucket_config.go index ac466c579..e1e7403d8 100644 --- a/weed/s3api/s3api_bucket_config.go +++ b/weed/s3api/s3api_bucket_config.go @@ -253,7 +253,7 @@ func (s3a *S3ApiServer) getVersioningState(bucket string) (string, error) { config, errCode := s3a.getBucketConfig(bucket) if errCode != s3err.ErrNone { if errCode == s3err.ErrNoSuchBucket { - return "", filer_pb.ErrNotFound + return "", nil } return "", fmt.Errorf("failed to get bucket config: %v", errCode) } diff --git a/weed/s3api/s3api_object_retention.go b/weed/s3api/s3api_object_retention.go index 03a4c0f55..760291842 100644 --- a/weed/s3api/s3api_object_retention.go +++ b/weed/s3api/s3api_object_retention.go @@ -591,7 +591,7 @@ func (s3a *S3ApiServer) enforceObjectLockProtections(request *http.Request, buck if err != nil { // If object doesn't exist, it's not under retention or legal hold - this is expected during delete operations - if errors.Is(err, ErrObjectNotFound) || errors.Is(err, ErrVersionNotFound) || errors.Is(err, ErrLatestVersionNotFound) { + if errors.Is(err, filer_pb.ErrNotFound) || errors.Is(err, ErrObjectNotFound) || errors.Is(err, ErrVersionNotFound) || errors.Is(err, ErrLatestVersionNotFound) { // Object doesn't exist, so it can't be under retention or legal hold - this is normal glog.V(4).Infof("Object %s/%s (versionId: %s) not found during object lock check (expected during delete operations)", bucket, object, versionId) return nil