diff options
| author | Kyr Shatskyy <kyrylo.shatskyy@gmail.com> | 2024-07-01 14:18:54 +0200 |
|---|---|---|
| committer | Kyr Shatskyy <kyrylo.shatskyy@gmail.com> | 2024-07-01 14:28:03 +0200 |
| commit | 4e54a9034c8ccee3f5283c079a0c32cf02282478 (patch) | |
| tree | 0f8e309ff042e5c2aada6db5da1254e771900a77 /qa/tasks/ceph.py | |
| parent | Merge pull request #58366 from zdover23/wip-doc-2024-07-01-cephfs-mount-prereqs (diff) | |
| download | ceph-4e54a9034c8ccee3f5283c079a0c32cf02282478.tar.xz ceph-4e54a9034c8ccee3f5283c079a0c32cf02282478.zip | |
qa: ceph.py mkfs.ext4 has no -f
Addresses probable issue:
mkfs.ext4: invalid option -- 'f'
Fixes: https://tracker.ceph.com/issues/10797
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
Diffstat (limited to 'qa/tasks/ceph.py')
| -rw-r--r-- | qa/tasks/ceph.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index 6314183c3b3..706ea6b89f1 100644 --- a/qa/tasks/ceph.py +++ b/qa/tasks/ceph.py @@ -990,7 +990,9 @@ def cluster(ctx, config): try: remote.run(args=['yes', run.Raw('|')] + ['sudo'] + mkfs + [dev]) except run.CommandFailedError: - # Newer btfs-tools doesn't prompt for overwrite, use -f + if fs != 'btrfs': + raise + # Newer btrfs-tools doesn't prompt for overwrite, use -f if '-f' not in mount_options: mkfs_options.append('-f') mkfs = ['mkfs.%s' % fs] + mkfs_options |