diff options
| author | Sage Weil <sage@newdream.net> | 2009-03-09 15:28:26 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2009-03-09 15:28:26 -0700 |
| commit | c46e1b320c6dd6523b0a215297299d3e08db3924 (patch) | |
| tree | ceb0a6d8d052651d07575f120991fa602dc193a1 | |
| parent | 3260c7585937d735946d67831be7612758e5680e (diff) | |
| download | ceph-c46e1b320c6dd6523b0a215297299d3e08db3924.tar.gz | |
mkcephfs: btrfsctl -a between mkfs and mountv0.7
| -rw-r--r-- | src/cosd.cluster.conf | 6 | ||||
| -rwxr-xr-x | src/mkcephfs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cosd.cluster.conf b/src/cosd.cluster.conf index 1d463647f94..a70790aba58 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 87671fa28d6..918cfbca064 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 |