Skip to content

Fix mounting of XFS volumes restored from snapshots #633

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
d-honeybadger merged 2 commits into from
Mar 24, 2025
Merged

Fix mounting of XFS volumes restored from snapshots #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f87a87
fix mounting of xfs volumes restored from snapshots
d-honeybadger Mar 21, 2025
df91e58
un-skip tests for XFS volumes restored from snapshots
d-honeybadger Mar 21, 2025
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
6 changes: 6 additions & 0 deletions driver/mounter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,12 @@ func (m *mounter) Mount(source, target, fsType string, opts ...string) error {
}
}

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

if len(opts) > 0 {
mountArgs = append(mountArgs, "-o", strings.Join(opts, ","))
}
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/run-versioned-e2e-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ if [[ "${SKIP_SEQUENTIAL_TESTS:-}" ]]; then
echo 'Skipping sequential tests'
else
echo 'Running sequential tests'
"ginkgo-${KUBE_VER}" -v -focus="External.Storage${focus}.*(\[Feature:|\[Serial\])" -skip='\[Disruptive\]|\[Feature:VolumeSourceXFS\]' "${E2E_TEST_FILE}" -- "-storage.testdriver=${TD_FILE}"
"ginkgo-${KUBE_VER}" -v -focus="External.Storage${focus}.*(\[Feature:|\[Serial\])" -skip='\[Disruptive\]' "${E2E_TEST_FILE}" -- "-storage.testdriver=${TD_FILE}"
fi
Loading