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

Merge pull request #78105 from cwdsuzhou/narrow_down_lock

Browse Source 
Narrow down the lock
This commit is contained in:
Kubernetes Prow Robot 2019-06-14 04:08:23 -07:00 committed by GitHub
commit 5777fdfe31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/volume/attachdetach/cache/actual_state_of_world.go vendored
View File

@ -277,9 +277,6 @@ func (asw *actualStateOfWorld) AddVolumeToReportAsAttached(
func (asw *actualStateOfWorld) AddVolumeNode( func (asw *actualStateOfWorld) AddVolumeNode(
uniqueName v1.UniqueVolumeName, volumeSpec *volume.Spec, nodeName types.NodeName, devicePath string, isAttached bool) (v1.UniqueVolumeName, error) { uniqueName v1.UniqueVolumeName, volumeSpec *volume.Spec, nodeName types.NodeName, devicePath string, isAttached bool) (v1.UniqueVolumeName, error) {
asw.Lock()
defer asw.Unlock()
volumeName := uniqueName volumeName := uniqueName
if volumeName == "" { if volumeName == "" {
if volumeSpec == nil { if volumeSpec == nil {
@ -306,6 +303,9 @@ func (asw *actualStateOfWorld) AddVolumeNode(
} }
} }
asw.Lock()
defer asw.Unlock()
volumeObj, volumeExists := asw.attachedVolumes[volumeName] volumeObj, volumeExists := asw.attachedVolumes[volumeName]
if !volumeExists { if !volumeExists {
volumeObj = attachedVolume{ volumeObj = attachedVolume{

2
pkg/controller/volume/attachdetach/cache/desired_state_of_world.go vendored
View File

@ -102,7 +102,7 @@ type DesiredStateOfWorld interface {
// mounted and attached for terminated pods // mounted and attached for terminated pods
GetKeepTerminatedPodVolumesForNode(k8stypes.NodeName) bool GetKeepTerminatedPodVolumesForNode(k8stypes.NodeName) bool
// Mark multiattach error as reported to prevent spamming multiple // Mark multi-attach error as reported to prevent spamming multiple
// events for same error // events for same error
SetMultiAttachError(v1.UniqueVolumeName, k8stypes.NodeName) SetMultiAttachError(v1.UniqueVolumeName, k8stypes.NodeName)