[taler-grid5k] 68/141: update clearing of dns

[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 0f49aff03c16a1478693bf26a6944931128d1f0c
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Fri Oct 22 00:28:27 2021 +0200

    update clearing of dns
---
 experiment/cleardns.sh          | 11 ++++++++---
 experiment/env                  |  2 ++
 experiment/run.sh               |  1 +
 experiment/scripts/test.sh      |  7 +++++--
 experiment/taler-perf-any.rspec | 26 +++++++++++++-------------
 5 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/experiment/cleardns.sh b/experiment/cleardns.sh
index 174d6a8..06ae2a8 100644
--- a/experiment/cleardns.sh
+++ b/experiment/cleardns.sh
@@ -22,9 +22,14 @@ while IFS='=' read -r name value; do
       # 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
-        del_ddn "wallet-${i}.${DNS_ZONE}"
+      i=0
+      while true; do
+       if nslookup "wallet-${i}.${DNS_ZONE}" > /dev/null; then
+          del_ddn "wallet-${i}.${DNS_ZONE}"
+         ((i++))
+       else
+          break
+       fi
       done
     else
       del_ddn "${value}"
diff --git a/experiment/env b/experiment/env
index dff9705..48cc72b 100755
--- a/experiment/env
+++ b/experiment/env
@@ -15,6 +15,8 @@ EXCHANGE_DOMAIN=exch.perf.taler
 MERCHANT_DOMAIN=merch.perf.taler
 MONITOR_DOMAIN=monitor.perf.taler
 PROXY_DOMAIN=proxy.perf.taler
+# Wallet domain is also needed for cleardns.sh
+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 e8012ed..83d8db0 100644
--- a/experiment/run.sh
+++ b/experiment/run.sh
@@ -61,6 +61,7 @@ case "${HOSTNAME}" in
     echo "MERCHANT"
     set_ddn ${MERCHANT_DOMAIN}
     exec ~/scripts/merchant.sh
+    ;;
   ${MONITOR_HOSTS})
     echo "MONITOR"
     set_ddn ${MONITOR_DOMAIN}
diff --git a/experiment/scripts/test.sh b/experiment/scripts/test.sh
index 49ccf15..f53ff3d 100755
--- a/experiment/scripts/test.sh
+++ b/experiment/scripts/test.sh
@@ -17,6 +17,7 @@ do
 
   if taler-wallet-cli \
       --wallet-db="${DB_FILE}" \
+      --no-throttle \
       advanced withdraw-fakebank \
         --exchange "http://${PROXY_DOMAIN}/"; \
         --bank "http://${BANK_DOMAIN}/"; \
@@ -30,6 +31,7 @@ do
 
   if taler-wallet-cli \
       --wallet-db="${DB_FILE}" \
+      --no-throttle \
       run-until-done \
         --max-retries=10;
   then
@@ -43,12 +45,13 @@ do
   do
     if taler-wallet-cli \
         --wallet-db="${DB_FILE}" \
+        --no-throttle \
        deposit create KUDOS:100 \
         "payto://x-taler-bank/${BANK_DOMAIN}/Exchange";
     then
-      log "paid KUDOS:100 to bank" 
+      log "deposited KUDOS:100 to bank" 
     else 
-      log "failed to pay KUDOS:100" "ERROR"
+      log "failed to deposit KUDOS:100" "ERROR"
       continue
     fi
   done
diff --git a/experiment/taler-perf-any.rspec b/experiment/taler-perf-any.rspec
index 79f21e5..0306508 100644
--- a/experiment/taler-perf-any.rspec
+++ b/experiment/taler-perf-any.rspec
@@ -1,60 +1,60 @@
 <?xml version='1.0'?>
-<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: 
[...]
+<rspec xmlns="http://www.geni.net/resources/rspec/3"; type="request" 
generated_by="jFed RSpec Editor" generated="2021-10-21T20:59:36.138+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"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="514.0" 
y="84.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="681.0" 
y="200.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.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="602.0" 
y="185.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="767.0" 
y="292.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.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <hardware_type name="grvingt-nancy"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="462.5" 
y="314.5"/>
+    <hardware_type name="nova-lyon"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="633.5" 
y="449.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.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="699.0" 
y="82.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="849.0" 
y="194.5"/>
   </node>
   <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>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="603.5" 
y="226.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="769.5" 
y="337.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>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="953.5" 
y="217.5"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="1131.5" 
y="355.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">
       <disk_image 
name="http://public.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <hardware_type name="grvingt-nancy"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="610.5" 
y="314.5"/>
+    <hardware_type name="nova-lyon"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="766.5" 
y="450.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.lille.grid5000.fr/~bfhch01/taler-debian11.dsc"/>
     </sliver_type>
-    <hardware_type name="grvingt-nancy"/>
-    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="762.5" 
y="315.5"/>
+    <hardware_type name="nova-lyon"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="894.5" 
y="448.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"/>
+    <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"; x="972.5" 
y="250.5"/>
   </node>
 </rspec>
\ No newline at end of file

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