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

Merge pull request #76341 from harsh-px/fix-concurrent-access-master

Browse Source 
Fix concurrent map write access in Portworx create volume call
This commit is contained in:
Kubernetes Prow Robot 2019-04-15 11:46:24 -07:00 committed by GitHub
commit d424bedc9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/volume/portworx/portworx_util.go
View File

@ -72,12 +72,14 @@ func (util *portworxVolumeUtil) CreateVolume(p *portworxVolumeProvisioner) (stri
} }
// Pass all parameters as volume labels for Portworx server-side processing // Pass all parameters as volume labels for Portworx server-side processing
if len(p.options.Parameters) > 0 { if spec.VolumeLabels == nil {
spec.VolumeLabels = p.options.Parameters
} else {
spec.VolumeLabels = make(map[string]string, 0) spec.VolumeLabels = make(map[string]string, 0)
} }
for k, v := range p.options.Parameters {
spec.VolumeLabels[k] = v
}
// Update the requested size in the spec // Update the requested size in the spec
spec.Size = uint64(requestGiB * volumehelpers.GiB) spec.Size = uint64(requestGiB * volumehelpers.GiB)