From 429ac4ef9c1b10db92399322193288099e843a4d Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 10 Dec 2009 13:01:27 -0800
Subject: [PATCH] ceph.conf.sepia: more osds, lockdep

---
 src/ceph.conf.sepia |  39 +++++++++++++++++
 src/cm.txt          | 102 ++++++++++++--------------------------------
 2 files changed, 67 insertions(+), 74 deletions(-)

diff --git a/src/ceph.conf.sepia b/src/ceph.conf.sepia
index 877d56b8b5a9b..11c698fc8a0a9 100644
--- a/src/ceph.conf.sepia
+++ b/src/ceph.conf.sepia
@@ -16,6 +16,7 @@
 ;	pre start command = "cp /home/sage/ceph/src/c$type /tmp/c$type.`date +%Y%m%d.%H%M%S`"
 	copy executable to = "/tmp/c$type.`date +%Y%m%d.%H%M%S`"
 	post start command = "echo 0x7f > /proc/\`pgrep c$type | head -1\`/coredump_filter"
+	lockdep = 1
 
 
 ; ---------------------
@@ -84,3 +85,41 @@
 	host = sepia7
 [osd8]
 	host = sepia8
+[osd9]
+	host = sepia9
+[osd10]
+	host = sepia10
+[osd11]
+	host = sepia11
+[osd12]
+	host = sepia12
+[osd13]
+	host = sepia13
+[osd14]
+	host = sepia14
+[osd15]
+	host = sepia15
+[osd16]
+	host = sepia16
+[osd17]
+	host = sepia17
+[osd18]
+	host = sepia18
+[osd19]
+	host = sepia19
+[osd20]
+	host = sepia20
+[osd21]
+	host = sepia21
+[osd22]
+	host = sepia22
+[osd23]
+	host = sepia23
+[osd24]
+	host = sepia24
+[osd25]
+	host = sepia25
+[osd26]
+	host = sepia26
+[osd27]
+	host = sepia27
diff --git a/src/cm.txt b/src/cm.txt
index d9afd9fdbacf9..b322568f6753c 100644
--- a/src/cm.txt
+++ b/src/cm.txt
@@ -25,6 +25,11 @@ device 20 device20
 device 21 device21
 device 22 device22
 device 23 device23
+device 24 device24
+device 25 device25
+device 26 device26
+device 27 device27
+
 
 # types
 type 0 device
@@ -32,98 +37,47 @@ type 1 domain
 type 2 pool
 
 # buckets
-pool metaroot {
-     	id -2
+domain root {
+	id -1		# do not change unnecessarily
 	alg straw
 	item device0 weight 1.000
+	item device1 weight 1.000
+	item device2 weight 1.000
+	item device3 weight 1.000
 	item device4 weight 1.000
+	item device5 weight 1.000
+	item device6 weight 1.000
+	item device7 weight 1.000
 	item device8 weight 1.000
-	item device12 weight 1.000
-	item device16 weight 1.000
-	item device20 weight 1.000
+	item device9 weight 1.0
 }
 
-domain cosd1 {
-	id -3		# do not change unnecessarily
-	alg uniform	# do not change bucket size (4) unnecessarily
-	item device1 weight 1.000 pos 0
-	item device2 weight 1.000 pos 1
-	item device3 weight 1.000 pos 2
-}
-domain cosd2 {
-	id -4		# do not change unnecessarily
-	alg uniform	# do not change bucket size (4) unnecessarily
-	item device5 weight 1.000 pos 0
-	item device6 weight 1.000 pos 1
-	item device7 weight 1.000 pos 2
-}
-domain cosd3 {
-	id -5		# do not change unnecessarily
-	alg uniform	# do not change bucket size (4) unnecessarily
-	item device9 weight 1.000 pos 0
-	item device10 weight 1.000 pos 1
-	item device11 weight 1.000 pos 2
-}
-domain cosd4 {
-	id -6		# do not change unnecessarily
-	alg uniform	# do not change bucket size (4) unnecessarily
-	item device13 weight 1.000 pos 0
-	item device14 weight 1.000 pos 1
-	item device15 weight 1.000 pos 2
-}
-domain cosd5 {
-	id -7		# do not change unnecessarily
-	alg uniform	# do not change bucket size (4) unnecessarily
-	item device17 weight 1.000 pos 0
-	item device18 weight 1.000 pos 1
-	item device19 weight 1.000 pos 2
-}
-domain cosd6 {
-	id -8		# do not change unnecessarily
-	alg uniform	# do not change bucket size (4) unnecessarily
-	item device21 weight 1.000 pos 0
-	item device22 weight 1.000 pos 1
-	item device23 weight 1.000 pos 2
-}
-pool root {
-	id -1		# do not change unnecessarily
-	alg straw
-	item cosd1 weight 4.000
-	item cosd2 weight 4.000
-	item cosd3 weight 4.000
-	item cosd4 weight 4.000
-	item cosd5 weight 4.000
-#	item cosd6 weight 4.000
-}
-
-
-
 # rules
-rule metadata {
-	pool 0
+rule data {
+	ruleset 0
 	type replicated
-	min_size 2
-	max_size 3
-	step take metaroot
+	min_size 1
+	max_size 10
+	step take root
 	step choose firstn 0 type device
 	step emit
 }
-rule data {
-	pool 1
+rule metadata {
+	ruleset 1
 	type replicated
-	min_size 2
-	max_size 3
+	min_size 1
+	max_size 10
 	step take root
-	step chooseleaf firstn 0 type domain
+	step choose firstn 0 type device
 	step emit
 }
 rule casdata {
-	pool 2
+	ruleset 2
 	type replicated
-	min_size 2
-	max_size 2
+	min_size 1
+	max_size 10
 	step take root
-	step chooseleaf firstn 0 type domain
+	step choose firstn 0 type device
 	step emit
 }
 
-- 
2.39.5