Skip to content

K
k3s
Commit 5b3b6557 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28153 from jsafrane/flaky-goroutinemap-wait

Automatic merge from submit-queue Fixed goroutinemap race on Wait() sync.WaitGroup produces data races when a GoroutineMap is empty and Wait() and Run() are called at the same time. From sync.WaitGroup: > Note that calls with a positive delta that occur when the counter is zero must happen before a Wait. Fixes #28128 Note that this issue affects only PersistentVolume unit tests. @saad-ali, PTAL
parents 45a1c6d3 06082b1b
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 5 deletions
pkg/util/goroutinemap/goroutinemap.go
View file @ 5b3b6557
...@@ -61,16 +61,18 @@ type GoRoutineMap interface { ...@@ -61,16 +61,18 @@ type GoRoutineMap interface {
// NewGoRoutineMap returns a new instance of GoRoutineMap. // NewGoRoutineMap returns a new instance of GoRoutineMap.
func NewGoRoutineMap(exponentialBackOffOnError bool) GoRoutineMap { func NewGoRoutineMap(exponentialBackOffOnError bool) GoRoutineMap {
return &goRoutineMap{ g := &goRoutineMap{
operations: make(map[string]operation), operations: make(map[string]operation),
exponentialBackOffOnError: exponentialBackOffOnError, exponentialBackOffOnError: exponentialBackOffOnError,
} }
g.cond = sync.NewCond(g)
return g
} }
type goRoutineMap struct { type goRoutineMap struct {
operations map[string]operation operations map[string]operation
exponentialBackOffOnError bool exponentialBackOffOnError bool
wg sync.WaitGroup cond *sync.Cond
sync.Mutex sync.Mutex
} }
...@@ -102,7 +104,6 @@ func (grm *goRoutineMap) Run(operationName string, operationFunc func() error) e ...@@ -102,7 +104,6 @@ func (grm *goRoutineMap) Run(operationName string, operationFunc func() error) e
lastErrorTime: existingOp.lastErrorTime, lastErrorTime: existingOp.lastErrorTime,
durationBeforeRetry: existingOp.durationBeforeRetry, durationBeforeRetry: existingOp.durationBeforeRetry,
} }
grm.wg.Add(1)
go func() (err error) { go func() (err error) {
// Handle unhandled panics (very unlikely) // Handle unhandled panics (very unlikely)
defer k8sRuntime.HandleCrash() defer k8sRuntime.HandleCrash()
...@@ -117,7 +118,7 @@ func (grm *goRoutineMap) Run(operationName string, operationFunc func() error) e ...@@ -117,7 +118,7 @@ func (grm *goRoutineMap) Run(operationName string, operationFunc func() error) e
} }
func (grm *goRoutineMap) operationComplete(operationName string, err *error) { func (grm *goRoutineMap) operationComplete(operationName string, err *error) {
defer grm.wg.Done() defer grm.cond.Signal()
grm.Lock() grm.Lock()
defer grm.Unlock() defer grm.Unlock()
...@@ -157,7 +158,12 @@ func (grm *goRoutineMap) operationComplete(operationName string, err *error) { ...@@ -157,7 +158,12 @@ func (grm *goRoutineMap) operationComplete(operationName string, err *error) {
} }
func (grm *goRoutineMap) Wait() { func (grm *goRoutineMap) Wait() {
grm.wg.Wait() grm.Lock()
defer grm.Unlock()
for len(grm.operations) > 0 {
grm.cond.Wait()
}
} }
func recoverFromPanic(operationName string, err *error) { func recoverFromPanic(operationName string, err *error) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment