Skip to content

Bug 1988374: UPSTREAM: 1988374: Disable uuid checks on XFS (#1614) #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Aug 26, 2021
Merged

Bug 1988374: UPSTREAM: 1988374: Disable uuid checks on XFS (#1614) #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions pkg/csi/cinder/nodeserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ func nodePublishEphemeral(req *csi.NodePublishVolumeRequest, ns *nodeServer) (*c
fsType = mnt.FsType
}
mountFlags := mnt.GetMountFlags()
options = append(options, mountFlags...)
options = append(options, collectMountOptions(fsType, mountFlags)...)
}
// Mount
err = m.Mounter().FormatAndMount(devicePath, targetPath, fsType, nil)
Expand Down Expand Up @@ -402,7 +402,7 @@ func (ns *nodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVol
fsType = mnt.FsType
}
mountFlags := mnt.GetMountFlags()
options = append(options, mountFlags...)
options = append(options, collectMountOptions(fsType, mountFlags)...)
}
// Mount
err = m.Mounter().FormatAndMount(devicePath, stagingTarget, fsType, options)
Expand Down Expand Up @@ -601,3 +601,15 @@ func getDevicePath(volumeID string, m mount.IMount) (string, error) {
return devicePath, nil

}

func collectMountOptions(fsType string, mntFlags []string) []string {
var options []string
options = append(options, mntFlags...)

// 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 == "xfs" {
options = append(options, "nouuid")
}
return options
}