[taler-grid5k] 67/141: add merchant, some comments in 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 15479d299d11d530bce649173e8c73d85a8ce394
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Thu Oct 21 15:09:47 2021 +0200

    add merchant, some comments in scripts
---
 configs/etc/monitor/promtail.yaml |  3 ++
 experiment/cleardns.sh            | 11 ++++----
 experiment/env                    | 23 +++++++++++----
 experiment/run.sh                 |  4 +++
 experiment/scripts/merchant.sh    |  6 ++++
 experiment/scripts/wallet.sh      |  4 ++-
 experiment/taler-perf-any.rspec   | 14 +++++++---
 experiment/taler-perf.rspec       | 59 ---------------------------------------
 8 files changed, 48 insertions(+), 76 deletions(-)

diff --git a/configs/etc/monitor/promtail.yaml 
b/configs/etc/monitor/promtail.yaml
index 81730c9..a2dc4b4 100644
--- a/configs/etc/monitor/promtail.yaml
+++ b/configs/etc/monitor/promtail.yaml
@@ -21,6 +21,9 @@ scrape_configs:
       target_label: proc_id
     - source_labels: [__syslog_message_hostname]
       target_label: host
+# Add a different syslog receiver for the wallets
+# We omit process id here since it changes too often, see 
+# https://grafana.com/blog/2020/08/27/the-concise-guide-to-labels-in-loki/
 - job_name: wallet
   syslog:
     listen_address: 0.0.0.0:1515
diff --git a/experiment/cleardns.sh b/experiment/cleardns.sh
index 78ce562..174d6a8 100644
--- a/experiment/cleardns.sh
+++ b/experiment/cleardns.sh
@@ -19,13 +19,12 @@ dig -t AXFR ${DNS_ZONE} ${DNS_HOST}
 while IFS='=' read -r name value; do
   if [[ $name == *"_DOMAIN" ]] && [[ $value == *".${DNS_ZONE}" ]]; then 
     if [[ $value == "wallet"* ]]; then 
-      # We will probably never use more than 20 wallet hosts 
-      for (( i=0; i < 20; i++ )) ;
+      # 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)
+      while nslookup "wallet-${i}.${DNS_ZONE}" > /dev/null;
       do
-        if nslookup "wallet-${i}.${DNS_ZONE}" > /dev/null;
-        then
-          del_ddn "wallet-${i}.${DNS_ZONE}"
-       fi
+        del_ddn "wallet-${i}.${DNS_ZONE}"
       done
     else
       del_ddn "${value}"
diff --git a/experiment/env b/experiment/env
index b7121db..dff9705 100755
--- a/experiment/env
+++ b/experiment/env
@@ -1,6 +1,7 @@
 BANK_HOSTS=nova-*.*
-EXCHANGE_HOSTS=grcinq-*.*
 DATABASE_HOSTS=gros-*.*
+EXCHANGE_HOSTS=grcinq-*.*
+MERCHANT_HOSTS=grvingt-*.*
 MONITOR_HOSTS=econome-*.*
 PROXY_HOSTS=grappe-*.*
 WALLET_HOSTS=uvb-*.*
@@ -8,12 +9,12 @@ WALLET_HOSTS=uvb-*.*
 DNS_HOST=taler.net
 DNS_ZONE=perf.taler
 
-PROXY_DOMAIN=proxy.perf.taler
-EXCHANGE_DOMAIN=exch.perf.taler
-DATABASE_DOMAIN=db.perf.taler
 BANK_DOMAIN=bank.perf.taler
+DATABASE_DOMAIN=db.perf.taler
+EXCHANGE_DOMAIN=exch.perf.taler
+MERCHANT_DOMAIN=merch.perf.taler
 MONITOR_DOMAIN=monitor.perf.taler
-WALLET_DOMAIN=wallet.perf.taler
+PROXY_DOMAIN=proxy.perf.taler
 
 PROMETHEUS_DATASOURCE_NAME=Prometheus
 LOKI_DATASOURCE_NAME=Loki
@@ -25,8 +26,18 @@ DB_NAME=taler-exchange
 DB_USER=taler
 DB_PASSWORD=
 
-NUM_EXCHANGE_PROCESSES=1
 NUM_WALLET_HOSTS=3
+
+# Number of wallets to run in parallel per host
+# If left empty, number of cpu cores is used
+NUM_WALLET_PROCESSES=64
+
+# Number of exchange processes to run
+# This number is incremented by one
+# i.e. specifying 0 will result in 1 process
+NUM_EXCHANGE_PROCESSES=1
+
+# If prometheus node exporter should be enabled
 ENABLE_EXPORTERS=true
 
 DYNDNS_KEY=
diff --git a/experiment/run.sh b/experiment/run.sh
index fd513d0..e8012ed 100644
--- a/experiment/run.sh
+++ b/experiment/run.sh
@@ -57,6 +57,10 @@ case "${HOSTNAME}" in
     set_ddn ${EXCHANGE_DOMAIN}
     exec ~/scripts/exchange.sh 
     ;;
+  ${MERCHANT_HOSTS})
+    echo "MERCHANT"
+    set_ddn ${MERCHANT_DOMAIN}
+    exec ~/scripts/merchant.sh
   ${MONITOR_HOSTS})
     echo "MONITOR"
     set_ddn ${MONITOR_DOMAIN}
diff --git a/experiment/scripts/merchant.sh b/experiment/scripts/merchant.sh
new file mode 100755
index 0000000..d641160
--- /dev/null
+++ b/experiment/scripts/merchant.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -eux
+
+source ~/scripts/helpers.sh
+
+restart_rsyslog
diff --git a/experiment/scripts/wallet.sh b/experiment/scripts/wallet.sh
index 024630e..355b1e0 100755
--- a/experiment/scripts/wallet.sh
+++ b/experiment/scripts/wallet.sh
@@ -10,4 +10,6 @@ fi
 
 wait_for_keys "${PROXY_DOMAIN}"
 
-parallel --ungroup ~/scripts/test.sh ::: {1..64}
+NUM_PROCESSES=${NUM_WALLET_PROCESSES:-$(lscpu | grep "^CPU(s):" | awk '{print 
$2}')}
+
+parallel --ungroup ~/scripts/test.sh ::: $(seq ${NUM_PROCESSES})
diff --git a/experiment/taler-perf-any.rspec b/experiment/taler-perf-any.rspec
index 7a98be9..79f21e5 100644
--- a/experiment/taler-perf-any.rspec
+++ b/experiment/taler-perf-any.rspec
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-10-20T14:03:09.438+02:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
+<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-10-21T14:34:18.696+02:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
   <node client_id="DB" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
@@ -10,7 +10,7 @@
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="607.0" 
y="188.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="602.0" 
y="185.5"/>
   </node>
   <node client_id="Wallet-0" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
@@ -25,7 +25,7 @@
     </sliver_type>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="699.0" 
y="82.5"/>
   </node>
-  <node client_id="Exch-Proxy" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+  <node client_id="Proxy" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
@@ -35,7 +35,7 @@
     <sliver_type name="raw-pc">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="936.0" 
y="172.0"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="953.5" 
y="217.5"/>
   </node>
   <node client_id="Wallet-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
     <sliver_type name="raw-pc">
@@ -51,4 +51,10 @@
     <hardware_type name="grvingt-nancy"/>
     <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="762.5" 
y="315.5"/>
   </node>
+  <node client_id="Merchant" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
+    <sliver_type name="raw-pc">
+      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
+    </sliver_type>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="793.5" 
y="127.5"/>
+  </node>
 </rspec>
\ No newline at end of file
diff --git a/experiment/taler-perf.rspec b/experiment/taler-perf.rspec
deleted file mode 100644
index 33bf357..0000000
--- a/experiment/taler-perf.rspec
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-10-15T23:48:28.888+02:00" 
xmlns:emulab="http://www.protogeni.net/resources/rspec/ext/emulab/1"; 
xmlns:delay="http://www.protogeni.net/resources/rspec/ext/delay/1"; 
xmlns:jfed-command="http://jfed.iminds.be/rspec/ext/jfed-command/1"; 
xmlns:client="http://www.protogeni.net/resources/rspec/ext/client/1"; 
xmlns:jfed-ssh-keys="http://jfed.iminds.be/rspec/ext/jfed-ssh-keys/1"; xmlns: 
[...]
-  <node client_id="DB" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
-    <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
-    </sliver_type>
-    <hardware_type name="gros-nancy"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="522.0" 
y="87.5"/>
-  </node>
-  <node client_id="Exchange" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
-    <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
-    </sliver_type>
-    <hardware_type name="grcinq-nancy"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="607.0" 
y="188.5"/>
-  </node>
-  <node client_id="Wallet-0" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
-    <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
-    </sliver_type>
-    <hardware_type name="uvb-sophia"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="475.5" 
y="352.5"/>
-  </node>
-  <node client_id="Bank" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
-    <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
-    </sliver_type>
-    <hardware_type name="nova-lyon"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="699.0" 
y="82.5"/>
-  </node>
-  <node client_id="Exch-Proxy" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
-    <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
-    </sliver_type>
-    <hardware_type name="grappe-nancy"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="603.5" 
y="228.5"/>
-  </node>
-  <node client_id="Monitor" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
-    <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
-    </sliver_type>
-    <hardware_type name="econome-nantes"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="850.0" 
y="154.0"/>
-  </node>
-  <node client_id="Wallet-1" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
-    <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
-    </sliver_type>
-    <hardware_type name="uvb-sophia"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="614.5" 
y="353.5"/>
-  </node>
-  <node client_id="Wallet-2" exclusive="true" 
component_manager_id="urn:publicid:IDN+am.grid5000.fr+authority+am">
-    <sliver_type name="raw-pc">
-      <disk_image 
name="http://public.lyon.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
-    </sliver_type>
-    <hardware_type name="uvb-sophia"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="758.5" 
y="353.5"/>
-  </node>
-</rspec>
\ No newline at end of file

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