[taler-grid5k] 116/141: add dnsmasq as stub resolver, tshark, update scripts

[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 ecded795839486434dc77841847b3b22dac44027
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Tue Nov 9 13:23:00 2021 +0100

    add dnsmasq as stub resolver, tshark, update scripts
---
 .../usr/lib/systemd/system/taler-wallet@.service   |  5 +-
 experiment/run.sh                                  |  2 +-
 .../{taler-wallet-bench.sh => benchmark.sh}        |  1 +
 experiment/scripts/helpers.sh                      |  1 -
 experiment/scripts/monitor.sh                      |  2 +-
 experiment/scripts/proxy.sh                        | 85 +++++++++++++---------
 experiment/setup.sh                                |  4 +-
 image/taler-debian11.yaml                          |  2 +-
 notes.txt                                          |  2 +-
 9 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/configs/usr/lib/systemd/system/taler-wallet@.service 
b/configs/usr/lib/systemd/system/taler-wallet@.service
index cd3fca8..419b666 100755
--- a/configs/usr/lib/systemd/system/taler-wallet@.service
+++ b/configs/usr/lib/systemd/system/taler-wallet@.service
@@ -1,13 +1,14 @@
 [Unit]
 Description=GNU Taler wallet benchmark
+# Always restart the process no matter how often it failed
 StartLimitIntervalSec=0
 
 [Service]
 Type=simple
 Restart=always
-RestartSec=2
+RestartSec=5
 EnvironmentFile=/etc/environment
-ExecStart=/root/scripts/taler-wallet-bench.sh %I
+ExecStart=/root/scripts/benchmark.sh %I
 
 StandardOutput=journal
 StandardError=journal
diff --git a/experiment/run.sh b/experiment/run.sh
index 170a325..93c6066 100644
--- a/experiment/run.sh
+++ b/experiment/run.sh
@@ -65,7 +65,7 @@ case "${HOSTNAME}" in
     set_host proxy
     set_ddn ${PROXY_DOMAIN}
     enable_netdelay ${EXCHANGE_DOMAIN}
-    exec ~/scripts/proxy.sh
+    exec ~/scripts/proxy.sh init
     ;;
   ${WALLET_HOSTS}) 
     set_host wallet
diff --git a/experiment/scripts/taler-wallet-bench.sh 
b/experiment/scripts/benchmark.sh
similarity index 94%
rename from experiment/scripts/taler-wallet-bench.sh
rename to experiment/scripts/benchmark.sh
index 0ad4159..649dd63 100755
--- a/experiment/scripts/taler-wallet-bench.sh
+++ b/experiment/scripts/benchmark.sh
@@ -9,6 +9,7 @@ case $1 in
 esac
 
 taler-wallet-cli \
+    -L ${LOG_LEVEL} \
     advanced bench1 \
       --config-json "
 {
diff --git a/experiment/scripts/helpers.sh b/experiment/scripts/helpers.sh
index 325a7a5..9cc0351 100755
--- a/experiment/scripts/helpers.sh
+++ b/experiment/scripts/helpers.sh
@@ -1,5 +1,4 @@
 #/!bin/bash
-set -eux
 
 function wait_for_db() {
   until PGPASSWORD="${DB_PASSWORD}" psql \
diff --git a/experiment/scripts/monitor.sh b/experiment/scripts/monitor.sh
index f233854..84b026b 100755
--- a/experiment/scripts/monitor.sh
+++ b/experiment/scripts/monitor.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -eux
+set -ex
 
 source ~/scripts/helpers.sh
 
diff --git a/experiment/scripts/proxy.sh b/experiment/scripts/proxy.sh
index f85270d..2fea45b 100755
--- a/experiment/scripts/proxy.sh
+++ b/experiment/scripts/proxy.sh
@@ -1,38 +1,53 @@
 #!/bin/bash
 set -eux
 
-source ~/scripts/helpers.sh
-
-sed -e "/<SERVERS_HERE>/a \ \ server ${EXCHANGE_DOMAIN}:80;" \
-    -e "s/<MONITOR_HOST_HERE>/${MONITOR_DOMAIN}/g" \
-        /etc/nginx/sites-available/proxy > /etc/nginx/sites-enabled/proxy
-
-# We want n processes, one is already enabled on port 80
-for (( i=1; i < ${NUM_EXCHANGE_PROCESSES}; i++ ))
-do
-  sed -i "/<SERVERS_HERE>/a \ \ server ${EXCHANGE_DOMAIN}:100${i};" \
-        /etc/nginx/sites-enabled/proxy
-done
-
-sed -i -e '/module(load="imudp")/s/^#//g' \
-       -e '/input(type="imudp" port="514")/s/^#//g' \
-          /etc/rsyslog.conf
-
-systemctl restart rsyslog
-
-echo "
-fs.file-max=50000
-" >> /etc/sysctl.conf
-
-echo "
-www-data soft nofile unlimited
-www-data hard nofile unlimited
-" >> /etc/security/limits.conf
-
-sysctl -p
-
-# Nginx does not start until the destination server is reachable - wait here
-# nginx: [emerg] host not found in upstream "exch.perf.taler" ...
-wait_for_keys "${EXCHANGE_DOMAIN}"
-
-systemctl restart nginx
+if [[ "$1" == "init" ]];
+then
+  source ~/scripts/helpers.sh
+  
+  sed -e "/<SERVERS_HERE>/a \ \ server ${EXCHANGE_DOMAIN}:80;" \
+      -e "s/<MONITOR_HOST_HERE>/${MONITOR_DOMAIN}/g" \
+          /etc/nginx/sites-available/proxy > /etc/nginx/sites-enabled/proxy
+  
+  # We want n processes, one is already enabled on port 80
+  for (( i=1; i < ${NUM_EXCHANGE_PROCESSES}; i++ ))
+  do
+    sed -i "/<SERVERS_HERE>/a \ \ server ${EXCHANGE_DOMAIN}:100${i};" \
+          /etc/nginx/sites-enabled/proxy
+  done
+  
+  sed -i -e '/module(load="imudp")/s/^#//g' \
+         -e '/input(type="imudp" port="514")/s/^#//g' \
+          /etc/rsyslog.conf
+  
+  systemctl restart rsyslog
+  
+  echo "
+  fs.file-max=50000
+  " >> /etc/sysctl.conf
+  
+  echo "
+  www-data soft nofile unlimited
+  www-data hard nofile unlimited
+  " >> /etc/security/limits.conf
+  
+  sysctl -p
+  
+  # Nginx does not start until the destination server is reachable - wait here
+  # nginx: [emerg] host not found in upstream "exch.perf.taler" ...
+  wait_for_keys "${EXCHANGE_DOMAIN}"
+  
+  systemctl restart nginx
+else
+
+  ADDED=$(grep -r "  server ${EXCHANGE_DOMAIN}:" 
/etc/nginx/sites-enabled/proxy | wc -l)
+  
+  for i in $(seq $1); do
+    let "i+=${ADDED}-1"
+    sed -i "/<SERVERS_HERE>/a \ \ server ${EXCHANGE_DOMAIN}:100${i};" \
+          /etc/nginx/sites-enabled/proxy
+  done
+
+fi
+
+systemctl reload nginx
diff --git a/experiment/setup.sh b/experiment/setup.sh
index 99bdff7..3c49412 100644
--- a/experiment/setup.sh
+++ b/experiment/setup.sh
@@ -32,10 +32,12 @@ EOF
 
 # Add our DNS on taler.net as the only nameserver 
 if ! grep -Fxq "nameserver ${NS_IP}" /etc/resolv.conf ; then
-  echo "nameserver ${NS_IP}" > /etc/resolv.conf
+  echo "nameserver 127.0.0.1" > /etc/resolv.conf
+  echo "nameserver ${NS_IP}" >> /etc/resolv.conf
 fi
 
 systemctl daemon-reload
+systemctl restart dnsmasq
 
 exec ~/scripts/createusers.sh
 
diff --git a/image/taler-debian11.yaml b/image/taler-debian11.yaml
index a7baa30..dcac8a7 100644
--- a/image/taler-debian11.yaml
+++ b/image/taler-debian11.yaml
@@ -38,7 +38,7 @@ global:
   ## Environment visibility
   # g5k_visibility: "shared"
   taler_build_packages: "recutils autoconf uncrustify autopoint libtool 
python3-pip libgcrypt20-dev libjansson-dev libcurl4-gnutls-dev libsodium-dev 
libidn2-dev libunistring-dev libmicrohttpd-dev libsqlite3-dev libqrencode-dev 
valgrind libpq-dev texinfo gdb make npm zip python3-distutils pkg-config"
-  taler_packages: "nginx postgresql-13 postgresql-contrib curl jq bc sudo git 
zile dnsutils prometheus-postgres-exporter prometheus-nginx-exporter net-tools 
netcat parallel nodejs"
+  taler_packages: "nginx postgresql-13 postgresql-contrib curl jq bc sudo git 
zile dnsutils prometheus-postgres-exporter prometheus-nginx-exporter net-tools 
netcat parallel nodejs tshark dnsmasq"
   taler_packages_no_recommends: "prometheus prometheus-node-exporter"
   other_packages_no_clean: "$${taler_packages} 
$${taler_packages_no_recommends} $${taler_build_packages}" 
   taler_disable_services: "nginx postgresql prometheus 
prometheus-postgres-exporter prometheus-nginx-exporter prometheus-node-exporter"
diff --git a/notes.txt b/notes.txt
index 927bfed..def8d16 100644
--- a/notes.txt
+++ b/notes.txt
@@ -15,4 +15,4 @@
     response from an upstream server.<br />
     The proxy server could not handle the request<p>Reason: <strong>Error 
reading from remote server</strong></p></p>
 * SSH login from rpesc viewer not possible
-* SSH login often fails - must provide password for cert and user (user 
password is not the one I speciefied, neither the default for the root user of 
the image) - or connection closed ...
+* SSH login often fails - must provide password for cert and user (user 
password is not the one I speciefied, neither the default for the root user of 
the image) - or connection closed ... - BUG in allocation code according to 
email

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