Add RAMCloud server options
- masterServiceThreads were raised to match current RAMCloud default
Change-Id: I9dc216eff173f6b77fa69fd0cd1d4cc06eafa2f1
diff --git a/conf/onos_node.conf b/conf/onos_node.conf
index 4e67466..183f696 100644
--- a/conf/onos_node.conf
+++ b/conf/onos_node.conf
@@ -37,6 +37,15 @@
# Port number of RAMCloud server (12242 by default)
#ramcloud.server.port = 12242
+# RAMCloud server option masterServiceThreads (5 by default)
+#ramcloud.masterServiceThreads = 5
+
+# RAMCloud server option logCleanerThreads (1 by default)
+#ramcloud.logCleanerThreads = 1
+
+# RAMCloud server option detectFailures [0=disabled] (0 by default for ONOS development)
+#ramcloud.detectFailures = 0
+
# List of hostname/ip[:port] which forms Hazelcast grid
# If this value is empty, Hazelcast will be set to multicast mode.
# Inversely, if this value is set, multicast settings will be ignored.
diff --git a/onos.sh b/onos.sh
index bb090e8..c8f3dbd 100755
--- a/onos.sh
+++ b/onos.sh
@@ -640,9 +640,13 @@
local coord_addr=`rc-coord-addr`
local server_addr=`rc-server-addr`
+ local masterServiceThreads=$(read-conf ${ONOS_CONF} ramcloud.masterServiceThreads 5)
+ local logCleanerThreads=$(read-conf ${ONOS_CONF} ramcloud.logCleanerThreads 1)
+ local detectFailures=$(read-conf ${ONOS_CONF} ramcloud.detectFailures 0)
+
# Run ramcloud
echo -n "Starting RAMCloud server ... "
- ${RAMCLOUD_HOME}/obj.${RAMCLOUD_BRANCH}/server -M -L ${server_addr} -C ${coord_addr} --masterServiceThreads 1 --logCleanerThreads 1 --detectFailures 0 > $RAMCLOUD_SERVER_LOG 2>&1 &
+ ${RAMCLOUD_HOME}/obj.${RAMCLOUD_BRANCH}/server -M -L ${server_addr} -C ${coord_addr} --masterServiceThreads ${masterServiceThreads} --logCleanerThreads ${logCleanerThreads} --detectFailures ${detectFailures} > $RAMCLOUD_SERVER_LOG 2>&1 &
echo "STARTED"
}