cosd: fewer osds, with big btrfs devices

diff --git a/src/cosd.cluster.conf b/src/cosd.cluster.conf
index 2e582ded84c059729385d44134b2f13af68f3590..1d463647f94840b6d3a06a9445b6345e0f0674a3 100644 (file)
--- 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 66a045c2c7cf271cc71bcd8da5b027c83d101873..87671fa28d6da4cc47f3b05c6445f9bf9009af9b 100755 (executable)
--- 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
            ;;