diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-06-29 16:21:16 +0500 |
|---|---|---|
| committer | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-06-29 16:21:16 +0500 |
| commit | bcbdc4cb37027be16810d0307676a3f7372f30e1 (patch) | |
| tree | f155bc55e3dfe79bc864183f975c4d395c3cb334 /weed/s3api/s3api_bucket_handlers.go | |
| parent | c6e6e303db12b61b899b62bfda7f65ae48f6e01c (diff) | |
| download | seaweedfs-bcbdc4cb37027be16810d0307676a3f7372f30e1.tar.xz seaweedfs-bcbdc4cb37027be16810d0307676a3f7372f30e1.zip | |
use const multipart uploads folder
avoid error bucket NotEmpty if multipart uploads folder exist
Diffstat (limited to 'weed/s3api/s3api_bucket_handlers.go')
| -rw-r--r-- | weed/s3api/s3api_bucket_handlers.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/weed/s3api/s3api_bucket_handlers.go b/weed/s3api/s3api_bucket_handlers.go index f70e46b92..c057ec10c 100644 --- a/weed/s3api/s3api_bucket_handlers.go +++ b/weed/s3api/s3api_bucket_handlers.go @@ -150,12 +150,14 @@ func (s3a *S3ApiServer) DeleteBucketHandler(w http.ResponseWriter, r *http.Reque err := s3a.WithFilerClient(false, func(client filer_pb.SeaweedFilerClient) error { if !s3a.option.AllowDeleteBucketNotEmpty { - entries, _, err := s3a.list(s3a.option.BucketsPath+"/"+bucket, "", "", false, 1) + entries, _, err := s3a.list(s3a.option.BucketsPath+"/"+bucket, "", "", false, 2) if err != nil { return fmt.Errorf("failed to list bucket %s: %v", bucket, err) } - if len(entries) > 0 { - return errors.New(s3err.GetAPIError(s3err.ErrBucketNotEmpty).Code) + for _, entry := range entries { + if entry.Name != s3_constants.MultipartUploadsFolder { + return errors.New(s3err.GetAPIError(s3err.ErrBucketNotEmpty).Code) + } } } |