Merge pull request #838 from leiyiz/release-1.2

Cherry pick #788 to release-1.2

Author: mattcary

pkg/gce-pd-csi-driver/node.go

@@ -137,10 +137,7 @@ func (ns *GCENodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePub
 		}
 
 		klog.V(4).Infof("NodePublishVolume with filesystem %s", fstype)
-
-		for _, flag := range mnt.MountFlags {
-			options = append(options, flag)
-		}
+		options = append(options, collectMountOptions(fstype, mnt.MountFlags)...)
 
 		sourcePath = stagingTargetPath
 		if err := preparePublishPath(targetPath, ns.Mounter); err != nil {
@@ -307,9 +304,7 @@ func (ns *GCENodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStage
 		if mnt.FsType != "" {
 			fstype = mnt.FsType
 		}
-		for _, flag := range mnt.MountFlags {
-			options = append(options, flag)
-		}
+		options = collectMountOptions(fstype, mnt.MountFlags)
 	} else if blk := volumeCapability.GetBlock(); blk != nil {
 		// Noop for Block NodeStageVolume
 		klog.V(4).Infof("NodeStageVolume succeeded on %v to %s, capability is block so this is a no-op", volumeID, stagingTargetPath)

pkg/gce-pd-csi-driver/utils.go

@@ -27,6 +27,10 @@ import (
 	"k8s.io/klog"
 )
 
+const (
+	fsTypeXFS = "xfs"
+)
+
 var ProbeCSIFullMethod = "/csi.v1.Identity/Probe"
 
 func NewVolumeCapabilityAccessMode(mode csi.VolumeCapability_AccessMode_Mode) *csi.VolumeCapability_AccessMode {
@@ -152,3 +156,18 @@ func getMultiWriterFromCapabilities(vcs []*csi.VolumeCapability) (bool, error) {
 	}
 	return false, nil
 }
+
+func collectMountOptions(fsType string, mntFlags []string) []string {
+	var options []string
+
+	for _, opt := range mntFlags {
+		options = append(options, opt)
+	}
+
+	// By default, xfs does not allow mounting of two volumes with the same filesystem uuid.
+	// Force ignore this uuid to be able to mount volume + its clone / restored snapshot on the same node.
+	if fsType == fsTypeXFS {
+		options = append(options, "nouuid")
+	}
+	return options
+}

pkg/gce-pd-csi-driver/utils_linux.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /*

pkg/gce-pd-csi-driver/utils_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*

pkg/mount-manager/safe-mounter_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

pkg/mount-manager/safe-mounter_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*

pkg/mount-manager/statter_windows.go

@@ -1,4 +1,6 @@
+//go:build windows
 // +build windows
+
 /*
 Copyright 2019 The Kubernetes Authors.
 

pkg/resizefs/resizefs_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*

pkg/resizefs/resizefs_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /*