From ca1d25d0383b43421565c8ba0e3ad10d924c8be1 Mon Sep 17 00:00:00 2001 From: "David J. M. Karlsen" Date: Fri, 10 Sep 2021 23:51:27 +0200 Subject: [PATCH 1/3] force-format xfs-filesystems too Signed-off-by: David J. M. Karlsen --- staging/src/k8s.io/mount-utils/mount_linux.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/mount-utils/mount_linux.go b/staging/src/k8s.io/mount-utils/mount_linux.go index 8b8857bdbd1..5d8949d01b1 100644 --- a/staging/src/k8s.io/mount-utils/mount_linux.go +++ b/staging/src/k8s.io/mount-utils/mount_linux.go @@ -30,7 +30,7 @@ import ( "syscall" "time" - "k8s.io/klog/v2" + "k8s.io/klog/v2" utilexec "k8s.io/utils/exec" utilio "k8s.io/utils/io" ) @@ -439,6 +439,11 @@ func (mounter *SafeFormatAndMount) formatAndMountSensitive(source string, target "-m0", // Zero blocks reserved for super-user source, } + } else if fstype == "xfs" { + args = []string{ + "-f", // force flag + source, + } } klog.Infof("Disk %q appears to be unformatted, attempting to format as type: %q with options: %v", source, fstype, args) From e16f75558dc49c348fa7d69af161dd7a529a125c Mon Sep 17 00:00:00 2001 From: "David J. M. Karlsen" Date: Sat, 11 Sep 2021 01:29:26 +0200 Subject: [PATCH 2/3] fix tests Signed-off-by: David J. M. Karlsen --- staging/src/k8s.io/mount-utils/mount_linux.go | 2 +- staging/src/k8s.io/mount-utils/safe_format_and_mount_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/staging/src/k8s.io/mount-utils/mount_linux.go b/staging/src/k8s.io/mount-utils/mount_linux.go index 5d8949d01b1..cc96bdc11d4 100644 --- a/staging/src/k8s.io/mount-utils/mount_linux.go +++ b/staging/src/k8s.io/mount-utils/mount_linux.go @@ -30,7 +30,7 @@ import ( "syscall" "time" - "k8s.io/klog/v2" + "k8s.io/klog/v2" utilexec "k8s.io/utils/exec" utilio "k8s.io/utils/io" ) diff --git a/staging/src/k8s.io/mount-utils/safe_format_and_mount_test.go b/staging/src/k8s.io/mount-utils/safe_format_and_mount_test.go index 38c2c8f5b9f..4ea39c13845 100644 --- a/staging/src/k8s.io/mount-utils/safe_format_and_mount_test.go +++ b/staging/src/k8s.io/mount-utils/safe_format_and_mount_test.go @@ -181,7 +181,7 @@ func TestSafeFormatAndMount(t *testing.T) { fstype: "xfs", execScripts: []ExecArgs{ {"blkid", []string{"-p", "-s", "TYPE", "-s", "PTTYPE", "-o", "export", "/dev/foo"}, "", &testingexec.FakeExitError{Status: 2}}, - {"mkfs.xfs", []string{"/dev/foo"}, "", nil}, + {"mkfs.xfs", []string{"-f", "/dev/foo"}, "", nil}, }, }, { @@ -198,7 +198,7 @@ func TestSafeFormatAndMount(t *testing.T) { mountErrs: []error{fmt.Errorf("unknown filesystem type '(null)'"), nil}, execScripts: []ExecArgs{ {"blkid", []string{"-p", "-s", "TYPE", "-s", "PTTYPE", "-o", "export", "/dev/foo"}, "", &testingexec.FakeExitError{Status: 4}}, - {"mkfs.xfs", []string{"/dev/foo"}, "", nil}, + {"mkfs.xfs", []string{"-f", "/dev/foo"}, "", nil}, }, expErrorType: GetDiskFormatFailed, }, From 39e13b49cb64042b61a7ca09efe422e5e46936a5 Mon Sep 17 00:00:00 2001 From: "David J. M. Karlsen" Date: Sat, 11 Sep 2021 11:51:34 +0200 Subject: [PATCH 3/3] go fmt Signed-off-by: David J. M. Karlsen --- staging/src/k8s.io/mount-utils/mount_linux.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/mount-utils/mount_linux.go b/staging/src/k8s.io/mount-utils/mount_linux.go index cc96bdc11d4..aaa592161d4 100644 --- a/staging/src/k8s.io/mount-utils/mount_linux.go +++ b/staging/src/k8s.io/mount-utils/mount_linux.go @@ -30,7 +30,7 @@ import ( "syscall" "time" - "k8s.io/klog/v2" + "k8s.io/klog/v2" utilexec "k8s.io/utils/exec" utilio "k8s.io/utils/io" ) @@ -441,7 +441,7 @@ func (mounter *SafeFormatAndMount) formatAndMountSensitive(source string, target } } else if fstype == "xfs" { args = []string{ - "-f", // force flag + "-f", // force flag source, } }