omg fixes
diff --git a/configs-examples/omg.yaml b/configs-examples/omg.yaml
index e339984..ee45d1b 100644
--- a/configs-examples/omg.yaml
+++ b/configs-examples/omg.yaml
@@ -5,10 +5,15 @@
explicit_nodes:
"ssh://root@host::/root/.ssh/id_rsa.pub": testnode
- "ssh://root@host2::/root/yportnova/.ssh/id_rsa.pub": testnode
+ "ssh://root@host2::/root/.ssh/id_rsa.pub": testnode
tests:
- omg:
prerun_script: "wally/suits/omgbench/prepare.sh"
run_script: "wally/suits/omgbench/run.sh"
- run_opts: "times 23 url rabbit://guest:guest@localhost"
\ No newline at end of file
+ run_opts: "times 40 timeout 60 url rabbit://guest:guest@localhost concurrency 40"
+
+sensors:
+ roles_mapping:
+ testnode: system-cpu, block-io, net-io
+ sensors_remote_path: /tmp/sensors
diff --git a/wally/suits/omgbench/__init__.py b/wally/suits/omgbench/__init__.py
index d3f82a2..10b84f1 100644
--- a/wally/suits/omgbench/__init__.py
+++ b/wally/suits/omgbench/__init__.py
@@ -19,7 +19,7 @@
count = 0
for res in data[0]:
msgs, success, duration = res.raw_result.strip().split('\n')
- count += msgs
+ count += int(msgs)
success_vals.append(float(success))
duration_vals.append(float(duration))
diff --git a/wally/suits/omgbench/run.sh b/wally/suits/omgbench/run.sh
index ebf093a..c0ca9a4 100755
--- a/wally/suits/omgbench/run.sh
+++ b/wally/suits/omgbench/run.sh
@@ -12,6 +12,14 @@
URL="$2"
shift
;;
+ timeout)
+ TIMEOUT="$2"
+ shift
+ ;;
+ concurrency)
+ CONC="$2"
+ shift
+ ;;
times)
TIMES="$2"
shift
@@ -32,11 +40,13 @@
cd omgbenchmark/rally_plugin
sed -i -e "s+rabbit:\/\/guest:guest@localhost\/+$URL+g" deployment.json
-sed -i -e "s,timeout\": 60,timeouts\": $TIMES,g" task_timeout.json
+sed -i -e "s,timeout\": 100,timeout\": $TIMEOUT,g" task_timeout.json
+sed -i -e "s,concurrency\": 40,concurrency\": $CONC,g" task_timeout.json
+sed -i -e "s,times\": 40,times\": $TIMES,g" task_timeout.json
rally --plugin-paths . deployment create --file=deployment.json --name=test &> /dev/null
-rally --plugin-paths . task start task.json &> ~/omg.log
+rally --plugin-paths . task start task_timeout.json &> ~/omg.log
-cat ~/omg.log | grep "Messages count" | grep -o '[0-9,.]\+'
+cat ~/omg.log | grep "Messages count" | grep -o '[0-9,.]\+' | tail -1
cat ~/omg.log | grep "total" | grep -o '[0-9,.]\+%' | grep -o '[0-9,.]\+'
cat ~/omg.log | grep "Load duration" | grep -o '[0-9,.]\+'