MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-06 04:40:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

tests: Protect globalLocalDrives against races (#16800)

Browse Source
This commit is contained in:
Klaus Post 2023-03-13 06:04:20 -07:00 committed by GitHub
parent cde7eeb660
commit 628042e65e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/background-newdisks-heal-ops.go
View File

@ -271,6 +271,9 @@ func initAutoHeal(ctx context.Context, objAPI ObjectLayer) {
} }
func getLocalDisksToHeal() (disksToHeal Endpoints) { func getLocalDisksToHeal() (disksToHeal Endpoints) {
globalLocalDrivesMu.RLock()
globalLocalDrives := globalLocalDrives
globalLocalDrivesMu.RUnlock()
for _, disk := range globalLocalDrives { for _, disk := range globalLocalDrives {
_, err := disk.GetDiskID() _, err := disk.GetDiskID()
if errors.Is(err, errUnformattedDisk) { if errors.Is(err, errUnformattedDisk) {

2
cmd/erasure-server-pool.go
View File

@ -156,7 +156,9 @@ func newErasureServerPools(ctx context.Context, endpointServerPools EndpointServ
break break
} }
globalLocalDrivesMu.Lock()
globalLocalDrives = localDrives globalLocalDrives = localDrives
defer globalLocalDrivesMu.Unlock()
return z, nil return z, nil
} }

4
cmd/globals.go
View File

@ -353,8 +353,10 @@ var (
globalServiceFreezeCnt int32 globalServiceFreezeCnt int32
globalServiceFreezeMu sync.Mutex // Updates. globalServiceFreezeMu sync.Mutex // Updates.
// List of local drives to this node, this is only set during server startup. // List of local drives to this node, this is only set during server startup,
// and should never be mutated. Hold globalLocalDrivesMu to access.
globalLocalDrives []StorageAPI globalLocalDrives []StorageAPI
globalLocalDrivesMu sync.RWMutex
// Is MINIO_CI_CD set? // Is MINIO_CI_CD set?
globalIsCICD bool globalIsCICD bool

16
cmd/peer-s3-server.go
View File

@ -80,6 +80,10 @@ func (s *peerS3Server) HealthHandler(w http.ResponseWriter, r *http.Request) {
} }
func listBucketsLocal(ctx context.Context, opts BucketOptions) (buckets []BucketInfo, err error) { func listBucketsLocal(ctx context.Context, opts BucketOptions) (buckets []BucketInfo, err error) {
globalLocalDrivesMu.RLock()
globalLocalDrives := globalLocalDrives
globalLocalDrivesMu.RUnlock()
quorum := (len(globalLocalDrives) / 2) quorum := (len(globalLocalDrives) / 2)
buckets = make([]BucketInfo, 0, 32) buckets = make([]BucketInfo, 0, 32)
@ -128,6 +132,10 @@ func listBucketsLocal(ctx context.Context, opts BucketOptions) (buckets []Bucket
} }
func getBucketInfoLocal(ctx context.Context, bucket string, opts BucketOptions) (BucketInfo, error) { func getBucketInfoLocal(ctx context.Context, bucket string, opts BucketOptions) (BucketInfo, error) {
globalLocalDrivesMu.RLock()
globalLocalDrives := globalLocalDrives
globalLocalDrivesMu.RUnlock()
g := errgroup.WithNErrs(len(globalLocalDrives)).WithConcurrency(32) g := errgroup.WithNErrs(len(globalLocalDrives)).WithConcurrency(32)
bucketsInfo := make([]BucketInfo, len(globalLocalDrives)) bucketsInfo := make([]BucketInfo, len(globalLocalDrives))
@ -173,6 +181,10 @@ func getBucketInfoLocal(ctx context.Context, bucket string, opts BucketOptions)
} }
func deleteBucketLocal(ctx context.Context, bucket string, opts DeleteBucketOptions) error { func deleteBucketLocal(ctx context.Context, bucket string, opts DeleteBucketOptions) error {
globalLocalDrivesMu.RLock()
globalLocalDrives := globalLocalDrives
globalLocalDrivesMu.RUnlock()
g := errgroup.WithNErrs(len(globalLocalDrives)).WithConcurrency(32) g := errgroup.WithNErrs(len(globalLocalDrives)).WithConcurrency(32)
// Make a volume entry on all underlying storage disks. // Make a volume entry on all underlying storage disks.
@ -208,6 +220,10 @@ func deleteBucketLocal(ctx context.Context, bucket string, opts DeleteBucketOpti
} }
func makeBucketLocal(ctx context.Context, bucket string, opts MakeBucketOptions) error { func makeBucketLocal(ctx context.Context, bucket string, opts MakeBucketOptions) error {
globalLocalDrivesMu.RLock()
globalLocalDrives := globalLocalDrives
globalLocalDrivesMu.RUnlock()
g := errgroup.WithNErrs(len(globalLocalDrives)).WithConcurrency(32) g := errgroup.WithNErrs(len(globalLocalDrives)).WithConcurrency(32)
// Make a volume entry on all underlying storage disks. // Make a volume entry on all underlying storage disks.