github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #96777 from lianghao208/patch-1

Browse Source 
fix: concurrent map writes error in VolumeBinding plugin during Filter
This commit is contained in:
Kubernetes Prow Robot 2020-11-23 06:51:34 -08:00 committed by GitHub
commit 733582456b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/scheduler/framework/plugins/volumebinding/volume_binding.go
View File

@ -20,6 +20,7 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"sync"
"time" "time"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
@ -53,6 +54,7 @@ type stateData struct {
// phase for each node // phase for each node
// it's initialized in the PreFilter phase // it's initialized in the PreFilter phase
podVolumesByNode map[string]*scheduling.PodVolumes podVolumesByNode map[string]*scheduling.PodVolumes
sync.Mutex
} }
func (d *stateData) Clone() framework.StateData { func (d *stateData) Clone() framework.StateData {
@ -205,9 +207,10 @@ func (pl *VolumeBinding) Filter(ctx context.Context, cs *framework.CycleState, p
return status return status
} }
cs.Lock() // multiple goroutines call `Filter` on different nodes simultaneously and the `CycleState` may be duplicated, so we must use a local lock here
state.Lock()
state.podVolumesByNode[node.Name] = podVolumes state.podVolumesByNode[node.Name] = podVolumes
cs.Unlock() state.Unlock()
return nil return nil
} }