astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-07-23 22:16:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

allow MakeBucketLocation to work for metaBucket (#14548)

Browse Source 
decommission would fail to start due to failure
in MakeBucketLocation() error on .minio.sys/ bucket
creation.

Allow these special buckets.
This commit is contained in:
Harshavardhana
2022-03-14 11:25:24 -07:00
committed by GitHub
parent c07af89e48
commit e3071157f0
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/erasure-bucket.go
+4 -2
View File
@@ -39,8 +39,10 @@ func (er erasureObjects) MakeBucketWithLocation(ctx context.Context, bucket stri
defer NSUpdated(bucket, slashSeparator) defer NSUpdated(bucket, slashSeparator)
// Verify if bucket is valid. // Verify if bucket is valid.
if err := s3utils.CheckValidBucketNameStrict(bucket); err != nil { if !isMinioMetaBucketName(bucket) {
return BucketNameInvalid{Bucket: bucket} if err := s3utils.CheckValidBucketNameStrict(bucket); err != nil {
return BucketNameInvalid{Bucket: bucket}
}
} }
storageDisks := er.getDisks() storageDisks := er.getDisks()
cmd/erasure-server-pool-decom.go
+4 -1
View File
@@ -962,8 +962,11 @@ func (z *erasureServerPools) StartDecommission(ctx context.Context, idx int) (er
pathJoin(minioMetaBucket, minioConfigPrefix), pathJoin(minioMetaBucket, minioConfigPrefix),
pathJoin(minioMetaBucket, bucketMetaPrefix), pathJoin(minioMetaBucket, bucketMetaPrefix),
} { } {
var bucketExists BucketExists
if err = z.MakeBucketWithLocation(ctx, metaBucket, BucketOptions{}); err != nil { if err = z.MakeBucketWithLocation(ctx, metaBucket, BucketOptions{}); err != nil {
return err if !errors.As(err, &bucketExists) {
return err
}
} }
} }