From: Sage Weil <sage@newdream.net>
Date: Mon, 9 Mar 2009 22:28:26 +0000 (-0700)
Subject: mkcephfs: btrfsctl -a between mkfs and mount
X-Git-Tag: v0.7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c46e1b320c6dd6523b0a215297299d3e08db3924;p=ceph.git

mkcephfs: btrfsctl -a between mkfs and mount
---

diff --git a/src/cosd.cluster.conf b/src/cosd.cluster.conf
index 1d463647f948..a70790aba584 100644
--- 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 87671fa28d6d..918cfbca0646 100755
--- 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