github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

AWS EBS: HandleCrash moved to util/runtime

pull/6/head
Justin Santa Barbara 2016-02-02 14:17:13 +00:00
parent 089951e7b4
commit d10e3debc7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/volume/aws_ebs/aws_util.go
View File

@ -26,9 +26,9 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/cloudprovider"
"k8s.io/kubernetes/pkg/cloudprovider/providers/aws" "k8s.io/kubernetes/pkg/cloudprovider/providers/aws"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/exec" "k8s.io/kubernetes/pkg/util/exec"
"k8s.io/kubernetes/pkg/util/keymutex" "k8s.io/kubernetes/pkg/util/keymutex"
"k8s.io/kubernetes/pkg/util/runtime"
"k8s.io/kubernetes/pkg/util/sets" "k8s.io/kubernetes/pkg/util/sets"
"k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume"
) )
@ -220,7 +220,7 @@ func verifyDevicePath(devicePaths []string, xvdBeforeSet sets.String) (string, e
// This function is intended to be called asynchronously as a go routine. // This function is intended to be called asynchronously as a go routine.
func detachDiskAndVerify(c *awsElasticBlockStoreCleaner) { func detachDiskAndVerify(c *awsElasticBlockStoreCleaner) {
glog.V(5).Infof("detachDiskAndVerify(...) for pd %q. Will block for pending operations", c.volumeID) glog.V(5).Infof("detachDiskAndVerify(...) for pd %q. Will block for pending operations", c.volumeID)
defer util.HandleCrash() defer runtime.HandleCrash()
// Block execution until any pending attach/detach operations for this PD have completed // Block execution until any pending attach/detach operations for this PD have completed
attachDetachMutex.LockKey(c.volumeID) attachDetachMutex.LockKey(c.volumeID)