Merge pull request #103 from davidz627/fix/Unmount

Made unmounting more robust

Author: k8s-ci-robot

Gopkg.lock

@@ -24,7 +24,6 @@
 #   go-tests = true
 #   unused-packages = true
 
-
 [[constraint]]
   name = "cloud.google.com/go"
   version = "0.19.0"
@@ -42,9 +41,9 @@
   branch = "master"
   name = "github.com/golang/glog"
 
-[[constraint]]
-  name = "github.com/stretchr/testify"
-  version = "1.2.1"
+#[[constraint]]
+#  name = "github.com/stretchr/testify"
+#  version = "1.2.1"
 
 [[constraint]]
   branch = "master"
@@ -63,7 +62,7 @@
   version = "1.10.0"
 
 [[constraint]]
-  branch = "master"
+  branch = "release-1.11"
   name = "k8s.io/apimachinery"
 
 [[constraint]]
@@ -78,7 +77,12 @@
 [[constraint]]
   branch = "master"
   name = "github.com/kubernetes-csi/csi-test"
-  
+
 [[constraint]]
   branch = "master"
   name = "k8s.io/test-infra"
+
+# Transitive dependency of k8s.io/kubernetes/pkg/util/parsers
+[[override]]
+  branch = "master"
+  name = "github.com/docker/distribution"

Gopkg.toml

@@ -26,6 +26,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"k8s.io/kubernetes/pkg/util/mount"
+	volumeutils "k8s.io/kubernetes/pkg/volume/util"
 	"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
 	metadataservice "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/gce-cloud-provider/metadata"
 	mountmanager "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager"
@@ -139,9 +140,7 @@ func (ns *GCENodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeU
 		return nil, status.Error(codes.InvalidArgument, "NodeUnpublishVolume Target Path must be provided")
 	}
 
-	// TODO(#96): Check volume still exists
-
-	err := ns.Mounter.Interface.Unmount(targetPath)
+	err := volumeutils.UnmountMountPoint(targetPath, ns.Mounter.Interface, false /* bind mount */)
 	if err != nil {
 		return nil, status.Error(codes.Internal, fmt.Sprintf("Unmount failed: %v\nUnmounting arguments: %s\n", err, targetPath))
 	}
@@ -259,7 +258,7 @@ func (ns *GCENodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUns
 		return nil, status.Error(codes.InvalidArgument, "NodeUnstageVolume Staging Target Path must be provided")
 	}
 
-	err := ns.Mounter.Interface.Unmount(stagingTargetPath)
+	err := volumeutils.UnmountMountPoint(stagingTargetPath, ns.Mounter.Interface, false /* bind mount */)
 	if err != nil {
 		return nil, status.Error(codes.Internal, fmt.Sprintf("NodeUnstageVolume failed to unmount at path %s: %v", stagingTargetPath, err))
 	}