ceph-disk-{prepare,activate}: Default mkfs arguments and mount options.

The values for the settings were copied from teuthology task "ceph".

Signed-off-by: Tommi Virtanen <tv@inktank.com>

diff --git a/src/ceph-disk-activate b/src/ceph-disk-activate
index ddfadebdfeb977d2bc5920e1a9da4313fd0d8fe3..e3b26e15b1e6112659f0e8b436ac0002c92457d0 100755 (executable)
--- 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 74b07155ffeada3083fe7fbb282ac150b00eb7da..d6ca516ed78bddc4d3d9a463a5ac18c9b57f0717 100755 (executable)
--- 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',
         ],
     )