[taler-grid5k] 138/189: possibility to start more wirewatchers

[gnunet]

This is an automated email from the git hooks/post-receive script.

marco-boss pushed a commit to branch master
in repository grid5k.

commit ef1d591a5d6f6c50f0b35a01688868526078fcdb
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sat Apr 9 19:19:19 2022 +0200

    possibility to start more wirewatchers
---
 .../lib/systemd/system/taler-data-backup.service   |  1 -
 .../usr/lib/systemd/system/taler-data-backup.timer |  2 +-
 experiment/scripts/benchmark.sh                    |  4 ++--
 experiment/scripts/data-backup.sh                  |  5 +++++
 experiment/scripts/exchange-wirewatch.sh           | 22 ++++++++++++++++++----
 experiment/scripts/taler-perf.sh                   | 16 ++++++++++++++++
 6 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/configs/usr/lib/systemd/system/taler-data-backup.service 
b/configs/usr/lib/systemd/system/taler-data-backup.service
index 0ede02c..304c9ab 100644
--- a/configs/usr/lib/systemd/system/taler-data-backup.service
+++ b/configs/usr/lib/systemd/system/taler-data-backup.service
@@ -4,7 +4,6 @@ Wants=taler-data-backup.service
 
 [Service]
 EnvironmentFile=/etc/environment
-Type=oneshot
 ExecStart=/root/scripts/data-backup.sh
 
 [Install]
diff --git a/configs/usr/lib/systemd/system/taler-data-backup.timer 
b/configs/usr/lib/systemd/system/taler-data-backup.timer
index b49a4a1..58f1aee 100644
--- a/configs/usr/lib/systemd/system/taler-data-backup.timer
+++ b/configs/usr/lib/systemd/system/taler-data-backup.timer
@@ -4,7 +4,7 @@ Requires=taler-data-backup.service
 
 [Timer]
 Unit=taler-data-backup.service
-OnCalendar=*:0/2
+OnCalendar=*:0/5
 
 [Install]
 WantedBy=timers.target
diff --git a/experiment/scripts/benchmark.sh b/experiment/scripts/benchmark.sh
index a79cc7a..812c825 100755
--- a/experiment/scripts/benchmark.sh
+++ b/experiment/scripts/benchmark.sh
@@ -35,11 +35,11 @@ function start_wallet_bench() {
     \"currency\": \"KUDOS\",
     \"payto\": \"payto://x-taler-bank/bank.${DNS_ZONE}/foo\",
     \"iterations\": 100000,
-    \"deposits\": $((RANDOM %21)),
+    \"deposits\": 0, 
     \"restartAfter\": 2
   }"
 }
-
+# $((RANDOM %21)),
 case $1 in
   [0-9]*)
     start_wallet_bench $1
diff --git a/experiment/scripts/data-backup.sh 
b/experiment/scripts/data-backup.sh
index f6d9411..e5b60c2 100755
--- a/experiment/scripts/data-backup.sh
+++ b/experiment/scripts/data-backup.sh
@@ -8,6 +8,11 @@
 
 set -eu
 
+if [[ $(ps -aux | grep "[data]-backup.sh" | wc -l) -eq 1 ]]; then
+  echo "Previous backup still running, skipping"
+  exit 0
+fi
+
 PROMETHEUS_DATA_DIR=/var/lib/prometheus/metrics2/snapshots
 LOKI_DATA_DIR=/tmp/loki
 
diff --git a/experiment/scripts/exchange-wirewatch.sh 
b/experiment/scripts/exchange-wirewatch.sh
index 054bb15..34deb8a 100755
--- a/experiment/scripts/exchange-wirewatch.sh
+++ b/experiment/scripts/exchange-wirewatch.sh
@@ -18,20 +18,34 @@ source ~/scripts/helpers.sh
 
 # Start N new exchange-aggregator processes
 # $1: N - number of new aggregators to start
-# NOTE: only for init purposes currently
-function start_wirewatchers() {
+function start_wirewatches() {
+  # count the running wirewatches so that numbers can be increased
+  RUNNING=$(ps -aux | grep "[taler]-exchange-wirewatch" | wc -l)
+
   for i in $(seq ${1}); do
+    let "i+=${RUNNING}"
     systemctl restart taler-exchange-wirewatch@"${i}".service
+    sleep 0.5
   done
 }
 
+function stop_wirewatches() {
+  stop_numbered_services "taler-exchange-wirewatch" $1
+}
+
 case $1 in
   init)
     setup_exchange_config_master_key_from_api
-    start_wirewatchers "$NUM_WIREWATCH_PROCESSES"
+    start_wirewatches "$NUM_WIREWATCH_PROCESSES"
     ;;
   init-start)
-    start_wirewatchers "$NUM_WIREWATCH_PROCESSES"
+    start_wirewatches "$NUM_WIREWATCH_PROCESSES"
+    ;;
+  start)
+    start_wirewatches "$2"
+    ;;
+  stop)
+    stop_wirewatches "$2"
     ;;
   *)
     taler_perf_help $0 "$INFO_MSG" "$OPT_MSG"
diff --git a/experiment/scripts/taler-perf.sh b/experiment/scripts/taler-perf.sh
index 1818298..92fd807 100644
--- a/experiment/scripts/taler-perf.sh
+++ b/experiment/scripts/taler-perf.sh
@@ -58,6 +58,16 @@ function stop_exchanges() {
   done
 }
 
+function start_wirewatches() {
+  ssh -A -o StrictHostKeyChecking=no "wirewatch.${DNS_ZONE}" \
+         "/bin/bash root/scripts/wirewatch.sh start ${1}"
+}
+
+function stop_wirewatches() {
+  ssh -A -o StrictHostKeyChecking=no "wirewatch.${DNS_ZONE}" \
+         "/bin/bash root/scripts/wirewatch.sh stop ${1}"
+}
+
 function start_processes() {
   case "$1" in
     wallet)
@@ -66,6 +76,9 @@ function start_processes() {
     exchange)
       start_exchanges $2
       ;;
+    wirewatch)
+      start_wirewatches $2
+      ;;
     *)
       echo "Unknown argument '$1' for function ${FUNCNAME[0]}"
       echo "Usage: start [wallet|exchange] NUM"
@@ -81,6 +94,9 @@ function stop_processes() {
     exchange)
       stop_exchanges $2
       ;;
+    wirewatch)
+      stop_wirewatches $2
+      ;;
     *)
       echo "Unknown argument '$1' for function ${FUNCNAME[0]}"
       echo "Usage: stop [wallet] NUM"

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.