mkcephfs: btrfsctl -a between mkfs and mount

diff --git a/src/cosd.cluster.conf b/src/cosd.cluster.conf
index 1d463647f94840b6d3a06a9445b6345e0f0674a3..a70790aba5846a0b02a1663a72a0b3a2d82b9183 100644 (file)
--- a/src/cosd.cluster.conf
+++ b/src/cosd.cluster.conf
@@ -22,15 +22,15 @@
 [osd3]
        host = cosd3
        osd data = devm/osd3
-       btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-4:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-5:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-6:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-7:0:0:0"
+       btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-4:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-5:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-6:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-7:0:0:0"
 [osd4]
        host = cosd4
        osd data = devm/osd4
-       btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-4:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-5:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-6:0:0:0"
+       btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-4:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-5:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-6:0:0:0"
 [osd5]
        host = cosd5
        osd data = devm/osd5
-       btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-4:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-5:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-6:0:0:0"
+       btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-4:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-5:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-6:0:0:0"
 
 [mds0]
        host = cosd0
\ No newline at end of file

diff --git a/src/mkcephfs b/src/mkcephfs
index 87671fa28d6da4cc47f3b05c6445f9bf9009af9b..918cfbca06460063f93a4d6c6f8c64f8e2c0eea2 100755 (executable)
--- a/src/mkcephfs
+++ b/src/mkcephfs
@@ -127,7 +127,7 @@ for name in $what; do
        first_dev=`echo $btrfs_devs | cut '-d ' -f 1`
        
        if [ $mkbtrfs -eq 1 ]; then
-           do_cmd "modprobe btrfs ; umount $btrfs_path ; mkfs.btrfs $btrfs_devs ; mount -t btrfs $first_dev $btrfs_path"
+           do_cmd "modprobe btrfs ; umount $btrfs_path ; for f in $btrfs_devs ; do umount \$f ; done ; mkfs.btrfs $btrfs_devs ; btrfsctl -a ; mount -t btrfs $first_dev $btrfs_path"
        fi
 
        [[ $ssh != "" ]] && scp $monmap $host:$monmap