Skip to content

Commit 8c2474f

Browse files
authored
Merge pull request kubernetes#90638 from tsmetana/vsphere-provision-pv-race
VSphere cloud provider: Fix race in disk provisioning
2 parents 81e96bf + 97a5fc0 commit 8c2474f

File tree

1 file changed

+5
-0
lines changed
  • staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers

1 file changed

+5
-0
lines changed

staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers/vdm.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ func (diskManager virtualDiskManager) Create(ctx context.Context, datastore *vcl
7070
taskInfo, err := task.WaitForResult(ctx, nil)
7171
vclib.RecordvSphereMetric(vclib.APICreateVolume, requestTime, err)
7272
if err != nil {
73+
if isAlreadyExists(diskManager.diskPath, err) {
74+
// The disk already exists, log info message and return success
75+
klog.V(vclib.LogLevel).Infof("File: %v already exists", diskManager.diskPath)
76+
return diskManager.diskPath, nil
77+
}
7378
klog.Errorf("Failed to complete virtual disk creation: %s. err: %+v", diskManager.diskPath, err)
7479
return "", err
7580
}

0 commit comments

Comments
 (0)