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

when a drive is closed cancel the cleanupTrash goroutine (#20337)

Browse Source 
when a hung drive is hot-unplugged, the server might go
into a loop where the previous `format.json` is somehow
still accessible to the process, we try to re-init() drives,
but that seems to cause a previous goroutine to hang around
since it is not canceled away when the drive is closed.

Bonus: add deadline for immediate purge routine, to unblock
it if the drive is blocking mutations.
This commit is contained in:
Harshavardhana 2024-08-28 08:31:42 -07:00 committed by GitHub
parent 1a2de1bdde
commit fb2360ff88
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/xl-storage.go
View File

@ -118,7 +118,8 @@ type xlStorage struct {
major, minor uint32 major, minor uint32
fsType string fsType string
immediatePurge chan string immediatePurge chan string
immediatePurgeCancel context.CancelFunc
// mutex to prevent concurrent read operations overloading walks. // mutex to prevent concurrent read operations overloading walks.
rotational bool rotational bool
@ -216,17 +217,21 @@ func newXLStorage(ep Endpoint, cleanUp bool) (s *xlStorage, err error) {
if globalIsTesting || globalIsCICD { if globalIsTesting || globalIsCICD {
immediatePurgeQueue = 1 immediatePurgeQueue = 1
} }
ctx, cancel := context.WithCancel(GlobalContext)
s = &xlStorage{ s = &xlStorage{
drivePath: ep.Path, drivePath: ep.Path,
endpoint: ep, endpoint: ep,
globalSync: globalFSOSync, globalSync: globalFSOSync,
diskInfoCache: cachevalue.New[DiskInfo](), diskInfoCache: cachevalue.New[DiskInfo](),
immediatePurge: make(chan string, immediatePurgeQueue), immediatePurge: make(chan string, immediatePurgeQueue),
immediatePurgeCancel: cancel,
} }
defer func() { defer func() {
if err == nil { if cleanUp && err == nil {
go s.cleanupTrashImmediateCallers(GlobalContext) go s.cleanupTrashImmediateCallers(ctx)
} }
}() }()
@ -399,7 +404,8 @@ func (s *xlStorage) Endpoint() Endpoint {
return s.endpoint return s.endpoint
} }
func (*xlStorage) Close() error { func (s *xlStorage) Close() error {
s.immediatePurgeCancel()
return nil return nil
} }
@ -1202,7 +1208,12 @@ func (s *xlStorage) cleanupTrashImmediateCallers(ctx context.Context) {
case <-ctx.Done(): case <-ctx.Done():
return return
case entry := <-s.immediatePurge: case entry := <-s.immediatePurge:
removeAll(entry) // Add deadlines such that immediate purge is not
// perpetually hung here.
w := xioutil.NewDeadlineWorker(globalDriveConfig.GetMaxTimeout())
w.Run(func() error {
return removeAll(entry)
})
} }
} }
} }