diff options
| -rwxr-xr-x | src/ceph-disk-activate | 12 | ||||
| -rwxr-xr-x | src/ceph-disk-prepare | 10 |
2 files changed, 16 insertions, 6 deletions
diff --git a/src/ceph-disk-activate b/src/ceph-disk-activate index ddfadebdfeb..e3b26e15b1e 100755 --- a/src/ceph-disk-activate +++ b/src/ceph-disk-activate @@ -347,11 +347,13 @@ def get_conf(cluster, variable): MOUNT_OPTIONS = dict( - # this is default ever since linux 2.6.39 / 3.0, but we'll delay a - # moment before removing it fully because we did have some issues - # with ext4 before the xatts-in-leveldb work, and it seemed that - # user_xattr helped - ext4='user_xattr', + btrfs='noatime,user_subvol_rm_allowed', + # user_xattr is default ever since linux 2.6.39 / 3.0, but we'll + # delay a moment before removing it fully because we did have some + # issues with ext4 before the xatts-in-leveldb work, and it seemed + # that user_xattr helped + ext4='noatime,user_xattr', + xfs='noatime', ) diff --git a/src/ceph-disk-prepare b/src/ceph-disk-prepare index 74b07155ffe..d6ca516ed78 100755 --- a/src/ceph-disk-prepare +++ b/src/ceph-disk-prepare @@ -99,15 +99,23 @@ def get_fsid(cluster): DEFAULT_FS_TYPE = 'ext4' MOUNT_OPTIONS = dict( - ext4='user_xattr', + btrfs='noatime,user_subvol_rm_allowed', + ext4='noatime,user_xattr', + xfs='noatime', ) MKFS_ARGS = dict( + btrfs=[ + '-m', 'single', + '-l', '32768', + '-n', '32768', + ], xfs=[ # xfs insists on not overwriting previous fs; even if we wipe # partition table, we often recreate it exactly the same way, # so we'll see ghosts of filesystems past '-f', + '-i', 'size=2048', ], ) |