github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-18 16:21:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #68388 from wgliang/fixbug/defer-in-loop

Browse Source 
fix bug that defer in infinite loop
This commit is contained in:
k8s-ci-robot 2018-09-23 19:27:03 -07:00 committed by GitHub
commit 7ffaa2f713
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/cloudprovider/providers/vsphere/vsphere_util.go
View File

@ -19,24 +19,23 @@ package vsphere
import ( import (
"context" "context"
"errors" "errors"
"fmt"
"io/ioutil"
"os" "os"
"path/filepath"
"regexp" "regexp"
"strings" "strings"
"time" "time"
"github.com/golang/glog" "github.com/golang/glog"
"github.com/vmware/govmomi/vim25" "github.com/vmware/govmomi/vim25"
"fmt"
"github.com/vmware/govmomi/vim25/mo" "github.com/vmware/govmomi/vim25/mo"
"io/ioutil"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
k8stypes "k8s.io/apimachinery/pkg/types" k8stypes "k8s.io/apimachinery/pkg/types"
"k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib" "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib"
"k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib/diskmanagers" "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib/diskmanagers"
"k8s.io/kubernetes/pkg/util/version" "k8s.io/kubernetes/pkg/util/version"
"path/filepath"
) )
const ( const (
@ -298,12 +297,16 @@ func (vs *VSphere) cleanUpDummyVMs(dummyVMPrefix string) {
continue continue
} }
// A write lock is acquired to make sure the cleanUp routine doesn't delete any VM's created by ongoing PVC requests. // A write lock is acquired to make sure the cleanUp routine doesn't delete any VM's created by ongoing PVC requests.
defer cleanUpDummyVMLock.Lock() cleanUpDummyVMs := func() {
cleanUpDummyVMLock.Lock()
defer cleanUpDummyVMLock.Unlock()
err = diskmanagers.CleanUpDummyVMs(ctx, vmFolder, dc) err = diskmanagers.CleanUpDummyVMs(ctx, vmFolder, dc)
if err != nil { if err != nil {
glog.V(4).Infof("Unable to clean up dummy VM's in the kubernetes cluster: %q. err: %+v", vs.cfg.Workspace.Folder, err) glog.V(4).Infof("Unable to clean up dummy VM's in the kubernetes cluster: %q. err: %+v", vs.cfg.Workspace.Folder, err)
} }
} }
cleanUpDummyVMs()
}
} }
// Get canonical volume path for volume Path. // Get canonical volume path for volume Path.