safely clean up loaded map (#5558)

This commit is contained in:
Chris Hoffman 2018-10-19 15:21:42 -04:00 committed by GitHub
parent d069e90e4d
commit ba9c1a249c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -497,9 +497,12 @@ func (m *ExpirationManager) Restore(errorFunc func()) (retErr error) {
wg.Wait() wg.Wait()
m.restoreModeLock.Lock() m.restoreModeLock.Lock()
m.restoreLoaded = sync.Map{}
m.restoreLocks = nil
atomic.StoreInt32(m.restoreMode, 0) atomic.StoreInt32(m.restoreMode, 0)
m.restoreLoaded.Range(func(k, v interface{}) bool {
m.restoreLoaded.Delete(k)
return true
})
m.restoreLocks = nil
m.restoreModeLock.Unlock() m.restoreModeLock.Unlock()
m.logger.Info("lease restore complete") m.logger.Info("lease restore complete")