put testing ceph.conf's in git

diff --git a/src/ceph.conf.cosd b/src/ceph.conf.cosd
new file mode 100644 (file)
index 0000000..e09a26e
--- /dev/null
+++ b/src/ceph.conf.cosd
@@ -0,0 +1,129 @@
+; ---------------------
+[group cephnet]
+        addr = 10.3.14.0/24
+
+[group backup]
+       addr =  10.104.0.219
+
+[mount /]
+        allow = "%cephnet %backup"
+
+; ---------------------
+[global]
+       pid file = /home/sage/ceph/src/out/$name.pid
+       logger dir = /home/sage/ceph/src/log
+       log sym dir = /home/sage/ceph/src/out
+       chdir = /home/sage/ceph/src
+       restart on core dump = false
+       user = sage
+       pre start command = "cp /home/sage/ceph/src/c$type /tmp/c$type.`date +%Y%m%d.%H%M%S`"
+
+; ---------------------
+[mon]
+       mon data = /data/mondata/mon$num
+       debug mon = 20
+       debug ms = 1
+       mon osd down out interval = 0  ; 10 minutes
+
+[mon0]
+       host = cosd0
+       mon addr = 10.3.14.95:6789
+       log dir = /data/cosd0
+
+[mon1]
+       host = cosd1
+       mon addr = 10.3.14.96:6789
+       log dir = /data/cosd1
+
+[mon2]
+       host = cosd2
+       mon addr = 10.3.14.97:6789
+       log dir = /data/ceph4
+
+
+; ---------------------
+[mds]
+       debug mds = 20
+       debug ms = 1
+;      debug journaler = 20
+;      log dir = /data/ceph4
+;      log dir = /home/sage/ceph/src/log
+
+[mds.foo]
+       host = ceph4
+       log dir = /data/ceph4
+;      valgrind = --tool=massif
+
+[mds.bar]
+       host = cephbooter
+       log dir = /data/cephbooter
+       auto start = false
+
+; ---------------------
+[osd]
+       debug ms = 1
+       debug osd = 20
+       debug filestore = 10
+       debug journal = 20
+       log dir = /data/cosd$id
+       osd data = /mnt/osd$id
+       btrfs options = "flushoncommit,wedgeabortedtrans,usertrans"
+;      user = root
+
+;      osd journal = /mnt/osd$id/journal
+;      osd journal size = 1000
+       osd journal = "/dev/disk/by-path/pci-0000:05:02.0-scsi-6:0:0:0"
+       filestore max sync interval = 5
+
+;      btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0"
+       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 \
+                  /dev/disk/by-path/pci-0000:05:02.0-scsi-0:0:0:0 \
+                  /dev/disk/by-path/pci-0000:05:02.0-scsi-1:0:0:0 \
+                  /dev/disk/by-path/pci-0000:05:02.0-scsi-2:0:0:0 \
+                  /dev/disk/by-path/pci-0000:05:02.0-scsi-3:0:0:0 \
+                  /dev/disk/by-path/pci-0000:05:02.0-scsi-4:0:0:0 \
+                  /dev/disk/by-path/pci-0000:05:02.0-scsi-5:0:0:0"
+
+;      valgrind = "--tool=memcheck --log-file=/data/cosd$id/v.osd$id"
+
+[osd0]
+       host = cosd0
+[osd1]
+       host = cosd1
+[osd2]
+       host = cosd2
+       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 \
+                  /dev/disk/by-path/pci-0000:05:02.0-scsi-0:0:0:0 \
+                  /dev/disk/by-path/pci-0000:05:02.0-scsi-2:0:0:0 \
+                  /dev/disk/by-path/pci-0000:05:02.0-scsi-3:0:0:0 \
+                  /dev/disk/by-path/pci-0000:05:02.0-scsi-4:0:0:0 \
+                  /dev/disk/by-path/pci-0000:05:02.0-scsi-5:0:0:0"
+
+[osd3]
+       host = cosd3
+       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:02.0-scsi-0:0:0:0 \
+                  /dev/disk/by-path/pci-0000:05:02.0-scsi-1:0:0:0 \
+                  /dev/disk/by-path/pci-0000:05:02.0-scsi-2:0:0:0 \
+                  /dev/disk/by-path/pci-0000:05:02.0-scsi-4:0:0:0 \
+                  /dev/disk/by-path/pci-0000:05:02.0-scsi-5:0:0:0"
+
+[osd4]
+       host = cosd4
+[osd5]
+       host = cosd5
+

diff --git a/src/ceph.conf.sepia b/src/ceph.conf.sepia
new file mode 100644 (file)
index 0000000..76e4ea5
--- /dev/null
+++ b/src/ceph.conf.sepia
@@ -0,0 +1,82 @@
+; ---------------------
+[group cephnet]
+        addr = 10.3.14.0/24
+
+[mount /]
+        allow = "%cephnet"
+
+; ---------------------
+[global]
+       pid file = /home/sage/ceph/src/out/$name.pid
+       logger dir = /home/sage/ceph/src/log
+       log sym dir = /home/sage/ceph/src/out
+       chdir = /home/sage/ceph/src
+       restart on core dump = false
+       user = sage
+       pre start command = "cp /home/sage/ceph/src/c$type /tmp/c$type.`date +%Y%m%d.%H%M%S`"
+
+; ---------------------
+[mon]
+       mon data = /data/mon$num
+       debug mon = 20
+       debug ms = 1
+       mon osd down out interval = 0  ; 10 minutes
+
+[mon0]
+       host = sepia1
+       mon addr = 10.3.14.128:6789
+       log dir = /data/sepia1
+
+; ---------------------
+[mds]
+       debug mds = 20
+       debug ms = 1
+;      debug journaler = 20
+;      log dir = /data/ceph4
+;      log dir = /home/sage/ceph/src/log
+
+[mds.foo]
+       host = sepia1
+       log dir = /data/sepia1
+;      valgrind = --tool=massif
+
+
+; ---------------------
+[osd]
+       debug ms = 1
+       debug osd = 20
+       debug filestore = 10
+       debug journal = 20
+
+       log dir = /data/sepia$id
+
+       osd data = /mnt/osd$id
+       btrfs devs = /dev/sdb
+       btrfs options = "flushoncommit"
+
+       osd journal = /dev/sda8
+
+;      user = root
+
+;      osd journal = /mnt/osd$id/journal
+;      osd journal size = 1000
+;      osd journal = "/dev/disk/by-path/pci-0000:05:02.0-scsi-6:0:0:0"
+       filestore max sync interval = 5
+
+;      btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0"
+;      valgrind = "--tool=memcheck --log-file=/data/cosd$id/v.osd$id"
+
+[osd2]
+       host = sepia2
+[osd3]
+       host = sepia3
+[osd4]
+       host = sepia4
+[osd5]
+       host = sepia5
+[osd6]
+       host = sepia6
+[osd7]
+       host = sepia7
+[osd8]
+       host = sepia8

diff --git a/src/ceph.conf.twoosds b/src/ceph.conf.twoosds
new file mode 100644 (file)
index 0000000..09677cf
--- /dev/null
+++ b/src/ceph.conf.twoosds
@@ -0,0 +1,96 @@
+; ---------------------
+[group cephnet]
+        addr = 10.3.14.0/24
+
+[group backup]
+       addr =  10.104.0.219
+
+[mount /]
+        allow = "%cephnet %backup"
+
+; ---------------------
+[global]
+       pid file = /home/sage/ceph/src/out/$name.pid
+       logger dir = /home/sage/ceph/src/log
+       log sym dir = /home/sage/ceph/src/out
+       chdir = /home/sage/ceph/src
+       restart on core dump = false
+       user = sage
+       pre start command = "cp /home/sage/ceph/src/c$type /tmp/c$type.`date +%Y%m%d.%H%M%S`"
+
+; ---------------------
+[mon]
+       mon data = /data/mondata/mon$num
+       debug mon = 20
+       debug ms = 20
+       mon osd down out interval = 0  ; 10 minutes
+
+[mon0]
+       host = cosd0
+       mon addr = 10.3.14.95:6789
+       log dir = /data/cosd0
+
+[mon1]
+       host = cosd1
+       mon addr = 10.3.14.96:6789
+       log dir = /data/cosd1
+
+[mon2]
+       host = cosd2
+       mon addr = 10.3.14.97:6789
+       log dir = /data/cosd2
+
+
+; ---------------------
+[mds]
+       debug mds = 20
+       debug ms = 1
+;      debug journaler = 20
+;      log dir = /data/ceph4
+;      log dir = /home/sage/ceph/src/log
+
+[mds.foo]
+       host = ceph4
+       log dir = /data/ceph4
+;      valgrind = --tool=massif
+
+[mds.bar]
+       host = cephbooter
+       log dir = /data/cephbooter
+       auto start = false
+
+; ---------------------
+[osd]
+       debug ms = 1
+       debug osd = 20
+       debug filestore = 20
+       debug journal = 20
+       log dir = /data/cosd$id
+       osd data = /mnt/osd$id
+       btrfs options = "flushoncommit,usertrans"
+;      user = root
+
+;      osd journal = /mnt/osd$id/journal
+;      osd journal size = 1000
+       osd journal = "/dev/disk/by-path/pci-0000:05:02.0-scsi-6:0:0:0"
+;      filestore max sync interval = 1
+
+       btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0"
+;      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 \
+;                 /dev/disk/by-path/pci-0000:05:02.0-scsi-0:0:0:0 \
+;                 /dev/disk/by-path/pci-0000:05:02.0-scsi-1:0:0:0 \
+;                 /dev/disk/by-path/pci-0000:05:02.0-scsi-2:0:0:0 \
+;                 /dev/disk/by-path/pci-0000:05:02.0-scsi-3:0:0:0 \
+;                 /dev/disk/by-path/pci-0000:05:02.0-scsi-4:0:0:0 \
+;                 /dev/disk/by-path/pci-0000:05:02.0-scsi-5:0:0:0"
+
+;      valgrind = "--tool=memcheck --log-file=/data/cosd$id/v.osd$id"
+
+[osd3]
+       host = cosd3
+

diff --git a/src/sample.ceph.conf.bigger b/src/sample.ceph.conf.bigger
deleted file mode 100644 (file)
index e09a26e..0000000
--- a/src/sample.ceph.conf.bigger
+++ /dev/null
@@ -1,129 +0,0 @@
-; ---------------------
-[group cephnet]
-        addr = 10.3.14.0/24
-
-[group backup]
-       addr =  10.104.0.219
-
-[mount /]
-        allow = "%cephnet %backup"
-
-; ---------------------
-[global]
-       pid file = /home/sage/ceph/src/out/$name.pid
-       logger dir = /home/sage/ceph/src/log
-       log sym dir = /home/sage/ceph/src/out
-       chdir = /home/sage/ceph/src
-       restart on core dump = false
-       user = sage
-       pre start command = "cp /home/sage/ceph/src/c$type /tmp/c$type.`date +%Y%m%d.%H%M%S`"
-
-; ---------------------
-[mon]
-       mon data = /data/mondata/mon$num
-       debug mon = 20
-       debug ms = 1
-       mon osd down out interval = 0  ; 10 minutes
-
-[mon0]
-       host = cosd0
-       mon addr = 10.3.14.95:6789
-       log dir = /data/cosd0
-
-[mon1]
-       host = cosd1
-       mon addr = 10.3.14.96:6789
-       log dir = /data/cosd1
-
-[mon2]
-       host = cosd2
-       mon addr = 10.3.14.97:6789
-       log dir = /data/ceph4
-
-
-; ---------------------
-[mds]
-       debug mds = 20
-       debug ms = 1
-;      debug journaler = 20
-;      log dir = /data/ceph4
-;      log dir = /home/sage/ceph/src/log
-
-[mds.foo]
-       host = ceph4
-       log dir = /data/ceph4
-;      valgrind = --tool=massif
-
-[mds.bar]
-       host = cephbooter
-       log dir = /data/cephbooter
-       auto start = false
-
-; ---------------------
-[osd]
-       debug ms = 1
-       debug osd = 20
-       debug filestore = 10
-       debug journal = 20
-       log dir = /data/cosd$id
-       osd data = /mnt/osd$id
-       btrfs options = "flushoncommit,wedgeabortedtrans,usertrans"
-;      user = root
-
-;      osd journal = /mnt/osd$id/journal
-;      osd journal size = 1000
-       osd journal = "/dev/disk/by-path/pci-0000:05:02.0-scsi-6:0:0:0"
-       filestore max sync interval = 5
-
-;      btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0"
-       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 \
-                  /dev/disk/by-path/pci-0000:05:02.0-scsi-0:0:0:0 \
-                  /dev/disk/by-path/pci-0000:05:02.0-scsi-1:0:0:0 \
-                  /dev/disk/by-path/pci-0000:05:02.0-scsi-2:0:0:0 \
-                  /dev/disk/by-path/pci-0000:05:02.0-scsi-3:0:0:0 \
-                  /dev/disk/by-path/pci-0000:05:02.0-scsi-4:0:0:0 \
-                  /dev/disk/by-path/pci-0000:05:02.0-scsi-5:0:0:0"
-
-;      valgrind = "--tool=memcheck --log-file=/data/cosd$id/v.osd$id"
-
-[osd0]
-       host = cosd0
-[osd1]
-       host = cosd1
-[osd2]
-       host = cosd2
-       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 \
-                  /dev/disk/by-path/pci-0000:05:02.0-scsi-0:0:0:0 \
-                  /dev/disk/by-path/pci-0000:05:02.0-scsi-2:0:0:0 \
-                  /dev/disk/by-path/pci-0000:05:02.0-scsi-3:0:0:0 \
-                  /dev/disk/by-path/pci-0000:05:02.0-scsi-4:0:0:0 \
-                  /dev/disk/by-path/pci-0000:05:02.0-scsi-5:0:0:0"
-
-[osd3]
-       host = cosd3
-       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:02.0-scsi-0:0:0:0 \
-                  /dev/disk/by-path/pci-0000:05:02.0-scsi-1:0:0:0 \
-                  /dev/disk/by-path/pci-0000:05:02.0-scsi-2:0:0:0 \
-                  /dev/disk/by-path/pci-0000:05:02.0-scsi-4:0:0:0 \
-                  /dev/disk/by-path/pci-0000:05:02.0-scsi-5:0:0:0"
-
-[osd4]
-       host = cosd4
-[osd5]
-       host = cosd5
-