[taler-grid5k] 103/141: update wallet domain name settings

[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 277ce61a988028d87658d0fc5caa2cae6b489ca2
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Thu Nov 4 18:04:15 2021 +0100

    update wallet domain name settings
---
 experiment/cleardns.sh         | 22 +++++++---------------
 experiment/env                 |  2 +-
 experiment/run.sh              | 12 +-----------
 experiment/scripts/helpers.sh  |  8 ++++++++
 experiment/scripts/merchant.sh |  2 ++
 experiment/scripts/monitor.sh  |  9 +++++++--
 6 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/experiment/cleardns.sh b/experiment/cleardns.sh
index b3f6a23..3d52bec 100644
--- a/experiment/cleardns.sh
+++ b/experiment/cleardns.sh
@@ -3,6 +3,7 @@
 set -eux
 
 source .env
+source ~/scripts/helpers.sh
 
 function del_ddn() {
   nsupdate -k /root/ddns.key -v << EOF
@@ -16,23 +17,14 @@ EOF
 dig -t AXFR ${DNS_ZONE} ${DNS_HOST}
 
 # Delete all old dns entries of the previous experitment
-while IFS='=' read -r name value; do
-  if [[ $name == *"_DOMAIN" ]] && [[ $value == *".${DNS_ZONE}" ]]; then 
-    if [[ $value == "wallet"* ]]; then 
-      # We created the wallets in a loop from 0 to n
-      # clear up to the first error
-      # (assuming dns is working this should be NXDOMAIN)
-      i=0
-      while true; do
-       if nslookup "wallet-${i}.${DNS_ZONE}" > /dev/null; then
-          del_ddn "wallet-${i}.${DNS_ZONE}"
-         let "i+=1"
-       else
-          break
-       fi
+while IFS='=' read -r NAME VALUE; do
+  if [[ "${NAME}" == *"_DOMAIN" ]] && [[ "${VALUE}" == *".${DNS_ZONE}" ]]; 
then 
+    if [[ "${VALUE}" == "wallet"* ]]; then 
+      for WALLET in $(get_wallet_domains); do
+        del_ddn "wallet.${WALLET}.${DNS_ZONE}"
       done
     else
-      del_ddn "${value}"
+      del_ddn "${VALUE}"
     fi
   fi
 done < .env
diff --git a/experiment/env b/experiment/env
index 28f8293..a6658ee 100755
--- a/experiment/env
+++ b/experiment/env
@@ -17,7 +17,7 @@ MERCHANT_DOMAIN=merch.perf.taler
    PROXY_DOMAIN=proxy.perf.taler
 
 # Wallet domain is also needed for cleardns.sh
-WALLET_DOMAIN=wallet-x.perf.taler
+WALLET_DOMAIN=wallet.x.perf.taler
 
 PROMETHEUS_DATASOURCE_NAME=Prometheus
 LOKI_DATASOURCE_NAME=Loki
diff --git a/experiment/run.sh b/experiment/run.sh
index 8f7683a..582b6a2 100644
--- a/experiment/run.sh
+++ b/experiment/run.sh
@@ -69,17 +69,7 @@ case "${HOSTNAME}" in
     ;;
   ${WALLET_HOSTS}) 
     set_host wallet
-    # sleep a random amount from 0 to 10 seconds 
-    # so every wallet has enough time and no entry is duplicated
-    sleep $((RANDOM % 10)).$((RANDOM))
-    for (( i = 0; i < ${NUM_WALLET_HOSTS}; ++i )) 
-    do 
-      if ! nslookup "wallet-${i}.${DNS_ZONE}"; 
-      then
-        set_ddn "wallet-${i}.${DNS_ZONE}"
-       break
-      fi
-    done
+    set_ddn "wallet.$(hostname | cut -d '.' -f1).${DNS_ZONE}"
     enable_netdelay ${PROXY_DOMAIN}
     exec ~/scripts/wallet.sh init
     ;;
diff --git a/experiment/scripts/helpers.sh b/experiment/scripts/helpers.sh
index 6c82409..325a7a5 100755
--- a/experiment/scripts/helpers.sh
+++ b/experiment/scripts/helpers.sh
@@ -38,3 +38,11 @@ function restart_rsyslog() {
   systemctl restart rsyslog
 }
 
+function get_wallet_domains() {
+  IFS=$'\n' read -r -d '' -a WALLETS < <(\
+    dig -t AXFR "${DNS_ZONE}" "@${DNS_HOST}" \
+    | grep wallet | awk '{print $1}' | cut -d '.' -f 2 \
+  )
+  echo ${WALLETS[@]}
+}
+
diff --git a/experiment/scripts/merchant.sh b/experiment/scripts/merchant.sh
index f280f70..137a6d8 100755
--- a/experiment/scripts/merchant.sh
+++ b/experiment/scripts/merchant.sh
@@ -36,6 +36,8 @@ psql postgres -tAc "SELECT 1 FROM pg_roles WHERE 
rolname='taler-merchant-httpd'"
 psql -tAc "SELECT 1 FROM pg_database WHERE datname='taler-merchant'" | \
   grep -q 1 || \
   createdb -O taler-merchant-httpd taler-merchant
+psql
+CREATE EXTENSION pg_stat_statements;
 EOF
 
 sudo -u taler-merchant-httpd taler-merchant-dbinit
diff --git a/experiment/scripts/monitor.sh b/experiment/scripts/monitor.sh
index d797fdf..269f8c3 100755
--- a/experiment/scripts/monitor.sh
+++ b/experiment/scripts/monitor.sh
@@ -30,12 +30,17 @@ function update_datasource() {
 update_datasource "${PROMETHEUS_DATASOURCE_NAME}" 
"${PROMETHEUS_G5K_PROXY_PORT}"
 update_datasource "${LOKI_DATASOURCE_NAME}" "${LOKI_G5K_PROXY_PORT}"
 
+
 if [[ "${ENABLE_EXPORTERS}" == "true" ]];
 then
+  while [[ "$(get_wallet_domains | wc -w)" != "${NUM_WALLET_HOSTS}" ]];
+  do
+    sleep 2
+  done
   cat /etc/monitor/node-exporters.yaml.tpl >> /etc/monitor/prometheus.yaml
-  for (( i=0; i < ${NUM_WALLET_HOSTS}; i++ ))
+  for WALLET in $(get_wallet_domains);
   do
-    sed -i "/<WALLETS_HERE>/a \ \ \ \ \ \ - 'wallet-${i}.perf.taler:9100'" \
+    sed -i "/<WALLETS_HERE>/a \ \ \ \ \ \ - 
'wallet.${WALLET}.perf.taler:9100'" \
            /etc/monitor/prometheus.yaml
   done
 fi

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