From: Sage Weil <sage@newdream.net>
Date: Mon, 9 Mar 2009 20:57:22 +0000 (-0700)
Subject: cosd: fewer osds, with big btrfs devices
X-Git-Tag: v0.7~9^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0422395507128d8c5cec87bb83bd92a1b7b384fe;p=ceph.git

cosd: fewer osds, with big btrfs devices
---

diff --git a/src/cosd.cluster.conf b/src/cosd.cluster.conf
index 2e582ded84c0..1d463647f948 100644
--- a/src/cosd.cluster.conf
+++ b/src/cosd.cluster.conf
@@ -2,7 +2,6 @@
 	pid file = /home/sage/ceph/src/out/$name.pid
 	restart on core dump = false
 	conf file = /home/sage/ceph/src/cosd.ceph.conf
-	crush map = cm.txt
 
 [mon]
 [mon0]
@@ -11,28 +10,27 @@
 	mon data = /home/sage/ceph/src/mondata/mon$num
 
 [osd]
-[osd0]
+[osd1]
 	host = cosd1
-	osd data = devm/osd0
-	btrfs devs = /dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0
-	btrfs path = devm/osd0
-[osd4]
+	osd data = devm/osd1
+	btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-2: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"
+[osd2]
 	host = cosd2
-	osd data = devm/osd4
-	btrfs devs = /dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0
+	osd data = devm/osd2
+	btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-2: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"
 
-[osd9]
+[osd3]
 	host = cosd3
-	osd data = devm/osd9
-	btrfs devs = /dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0
-[osd13]
+	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"
+[osd4]
 	host = cosd4
-	osd data = devm/osd13
-	btrfs devs = /dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0
-[osd17]
+	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"
+[osd5]
 	host = cosd5
-	osd data = devm/osd17
-	btrfs devs = /dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0
+	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"
 
 [mds0]
 	host = cosd0
\ No newline at end of file
diff --git a/src/mkcephfs b/src/mkcephfs
index 66a045c2c7cf..87671fa28d6d 100755
--- a/src/mkcephfs
+++ b/src/mkcephfs
@@ -25,9 +25,13 @@ clobber=""
 mkbtrfs=0
 numosd=
 usecrushmap=
+verbose=0
 
 while [ $# -ge 1 ]; do
 case $1 in
+    -v )
+	    verbose=1;
+	    ;;
     --allhosts | -a)
 	    allhosts=1
 	    ;;