Archipelago: Adjust new conffile

[archipelago] / xseg / conf / archipelago.conf

diff --git a/xseg/conf/archipelago.conf b/xseg/conf/archipelago.conf
index 95b9a7f..82c2848 100644 (file)
--- a/xseg/conf/archipelago.conf
+++ b/xseg/conf/archipelago.conf
@@ -16,6 +16,13 @@ VTOOL_START=1003
 # End of port range that can be used by the vlmc tool
 VTOOL_END=1022
 
+[PEERS]
+ROLES=blockerb blockerm mapperd vlmcd
+# Order matters. Peers will be started with list order and stopped with reversed
+# order.
+ORDER=blockerb blockerm mapperd vlmcd
+
+
 # (peer role, peer type)
 # Mandatory peer roles:
 #      blockerb
@@ -29,14 +36,6 @@ VTOOL_END=1022
 #      mapperd
 #      vlmcd
 #
-# Order matters. Peers will be started with list order and stopped with reversed
-# order.
-
-[ROLES]
-order=[('blockerb', 'file_blocker'),
-         ('blockerm', 'file_blocker'),
-         ('mapperd', 'mapperd'),
-         ('vlmcd', 'vlmcd')]
 
 # Generic peer options
 # portno_start: Start of port range that will be used by the peer
@@ -64,7 +63,8 @@ order=[('blockerb', 'file_blocker'),
 #
 # pool: rados pool where objects will reside
 
-[BLOCKERB]
+[blockerb]
+type=file_blocker
 portno_start=1000
 portno_end=1000
 log_level=3
@@ -74,12 +74,13 @@ archip_dir=/srv/archip/blocks
 fdcache=512
 direct=True
 
-[BLOCKERM]
+[blockerm]
+type=file_blocker
 portno_start=1002
 portno_end=1002
 log_level=3
-nr_ops=256
-nr_threads=256
+nr_ops=64
+nr_threads=64
 archip_dir=/srv/archip/maps
 fdcache=512
 direct=True
@@ -89,11 +90,12 @@ direct=True
 # blockerb_port: target port that will be used to communicate with the blockerb
 # blockerm_port: target port that will be used to communicate with the blockerm
 
-[MAPPERD]
+[mapperd]
+type=mapperd
 portno_start=1001
 portno_end=1001
 log_level=3
-nr_ops=256
+nr_ops=512
 blockerb_port=1000
 blockerm_port=1002
 
@@ -102,7 +104,8 @@ blockerm_port=1002
 # blocker_port: target port that will be used to communicate with the blockerb
 # mapper_port: target port that will be used to communicate with the mapper
 
-[VLMCD]
+[vlmcd]
+type=vlmcd
 portno_start=500
 portno_end=999
 log_level=3