fix(node): better checks on umount

enix · Apr 27, 2021 · 34b65af · 34b65af
1 parent 2a5b8bf
commit 34b65af
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/pkg/node/node.go b/pkg/node/node.go
@@ -202,14 +202,19 @@ func (node *Node) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpublis
 		out, err := exec.Command("mountpoint", req.GetTargetPath()).CombinedOutput()
 		if err == nil {
 			out, err := exec.Command("umount", req.GetTargetPath()).CombinedOutput()
-			if err != nil && !os.IsNotExist(err) {
+			if err != nil {
 				return nil, status.Error(codes.Internal, string(out))
 			}
 		} else {
 			klog.Warningf("assuming that volume is already unmounted: %s", out)
 		}
 
-		os.Remove(req.GetTargetPath())
+		err = os.Remove(req.GetTargetPath())
+		if err != nil && !os.IsNotExist(err) {
+			return nil, status.Error(codes.Internal, err.Error())
+		}
+	} else {
+		klog.Warningf("assuming that volume is already unmounted: %v", err)
 	}
 
 	iscsiInfoPath := node.getIscsiInfoPath(req.GetVolumeId())