gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

return proper default value for locking and versioning

Browse Source 
fix https://github.com/seaweedfs/seaweedfs/issues/6971
fix https://github.com/seaweedfs/seaweedfs/issues/7028
This commit is contained in:
chrislu
2025-07-23 22:20:48 -07:00
parent 4f72a1778f
commit 7ab85c3748
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
weed/s3api/s3api_bucket_config.go
View File

@@ -253,7 +253,7 @@ func (s3a *S3ApiServer) getVersioningState(bucket string) (string, error) {
config, errCode := s3a.getBucketConfig(bucket) config, errCode := s3a.getBucketConfig(bucket)
if errCode != s3err.ErrNone { if errCode != s3err.ErrNone {
if errCode == s3err.ErrNoSuchBucket { if errCode == s3err.ErrNoSuchBucket {
return "", filer_pb.ErrNotFound return "", nil
} }
return "", fmt.Errorf("failed to get bucket config: %v", errCode) return "", fmt.Errorf("failed to get bucket config: %v", errCode)
} }

2
weed/s3api/s3api_object_retention.go
View File

@@ -591,7 +591,7 @@ func (s3a *S3ApiServer) enforceObjectLockProtections(request *http.Request, buck
if err != nil { if err != nil {
// If object doesn't exist, it's not under retention or legal hold - this is expected during delete operations // 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 // 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) glog.V(4).Infof("Object %s/%s (versionId: %s) not found during object lock check (expected during delete operations)", bucket, object, versionId)
return nil return nil