MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 06:05:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

simplify monitoring doesn't need to be canceled (#10803)

Browse Source 
connect disks monitoring doesn't need to be canceled
upon drive replacement, since we only need to replace
the newly replaced drive.
This commit is contained in:
Harshavardhana 2020-10-31 14:10:12 -07:00 committed by GitHub
parent fe9f23e632
commit 5412d730c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/erasure-sets.go
View File

@ -83,8 +83,7 @@ type erasureSets struct {
setCount, setDriveCount int setCount, setDriveCount int
listTolerancePerSet int listTolerancePerSet int
monitorContextCancel context.CancelFunc disksConnectEvent chan diskConnectInfo
disksConnectEvent chan diskConnectInfo
// Distribution algorithm of choice. // Distribution algorithm of choice.
distributionAlgo string distributionAlgo string
@ -419,11 +418,8 @@ func newErasureSets(ctx context.Context, endpoints Endpoints, storageDisks []Sto
GlobalStaleUploadsCleanupInterval, GlobalStaleUploadsExpiry) GlobalStaleUploadsCleanupInterval, GlobalStaleUploadsExpiry)
} }
mctx, mctxCancel := context.WithCancel(ctx)
s.monitorContextCancel = mctxCancel
// Start the disk monitoring and connect routine. // Start the disk monitoring and connect routine.
go s.monitorAndConnectEndpoints(mctx, defaultMonitorConnectEndpointInterval) go s.monitorAndConnectEndpoints(ctx, defaultMonitorConnectEndpointInterval)
go s.maintainMRFList() go s.maintainMRFList()
go s.healMRFRoutine() go s.healMRFRoutine()
@ -1265,8 +1261,6 @@ func (s *erasureSets) HealFormat(ctx context.Context, dryRun bool) (res madmin.H
return madmin.HealResultItem{}, err return madmin.HealResultItem{}, err
} }
s.monitorContextCancel() // turn-off disk monitoring and replace format.
s.erasureDisksMu.Lock() s.erasureDisksMu.Lock()
for index, format := range tmpNewFormats { for index, format := range tmpNewFormats {
@ -1287,14 +1281,10 @@ func (s *erasureSets) HealFormat(ctx context.Context, dryRun bool) (res madmin.H
s.endpointStrings[m*s.setDriveCount+n] = storageDisks[index].String() s.endpointStrings[m*s.setDriveCount+n] = storageDisks[index].String()
} }
// Replace with new reference format. // Replace reference format with what was loaded from disks.
s.format = refFormat s.format = refFormat
s.erasureDisksMu.Unlock() s.erasureDisksMu.Unlock()
mctx, mctxCancel := context.WithCancel(GlobalContext)
s.monitorContextCancel = mctxCancel
go s.monitorAndConnectEndpoints(mctx, defaultMonitorConnectEndpointInterval)
} }
return res, nil return res, nil