mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2025-11-24 08:46:54 +08:00
return proper default value for locking and versioning
fix https://github.com/seaweedfs/seaweedfs/issues/6971 fix https://github.com/seaweedfs/seaweedfs/issues/7028
This commit is contained in:
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user