[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-grid5k] branch master updated (653b702 -> 0c6cce0)
From: |
gnunet |
Subject: |
[taler-grid5k] branch master updated (653b702 -> 0c6cce0) |
Date: |
Sun, 05 Jun 2022 21:46:54 +0200 |
This is an automated email from the git hooks/post-receive script.
marco-boss pushed a change to branch master
in repository grid5k.
from 653b702 integrate final changes from setup
new e44d02a change to receiver
new 14ac948 missing id in old logs
new 91392de do not restart to get measures of aggregator
new 6abd0ae fix
new 880fd46 fix
new 645ad3c test wire_gateway
new f3d1677 fix
new a7c0203 add receiver-name to all accounts
new 305e339 restore wallet service
new 752db1e wallet more iterations
new 0c6cce0 Merge branch 'node-setup'
The 11 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 1 +
.../{taler.neowise.rspec => taler.medium.rspec} | 144 +++++++++++----------
configs/etc/monitor/promtail.yaml | 2 +-
configs/etc/taler/conf.d/exchange-business.conf | 2 +-
.../exchange-accountcredentials.secret.conf | 4 +-
experiment/scripts/benchmark.sh | 15 ++-
experiment/scripts/database.sh | 3 +-
experiment/scripts/exchange.sh | 2 +-
experiment/scripts/merchant.sh | 2 +-
.../scripts/postgres-cluster/exch-cluster.sh | 2 +-
10 files changed, 98 insertions(+), 79 deletions(-)
copy additional/rspecs/{taler.neowise.rspec => taler.medium.rspec} (86%)
diff --git a/.gitignore b/.gitignore
index 19ace02..82eb5ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
.env
+*.gz
.swp
diff --git a/additional/rspecs/taler.neowise.rspec
b/additional/rspecs/taler.medium.rspec
similarity index 86%
copy from additional/rspecs/taler.neowise.rspec
copy to additional/rspecs/taler.medium.rspec
index 09fa32f..9a9fe18 100644
--- a/additional/rspecs/taler.neowise.rspec
+++ b/additional/rspecs/taler.medium.rspec
@@ -1,333 +1,347 @@
<?xml version='1.0'?>
-<rspec xmlns="http://www.geni.net/resources/rspec/3" type="request"
generated_by="jFed RSpec Editor" generated="2022-05-26T08:21:12.491+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="2022-05-31T23:25:25.354+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>
- <hardware_type name="neowise-lyon"/>
- <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="95.17699115044248" y="45.631578947368425"/>
+ <hardware_type name="dahu-grenoble"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="94.0"
y="32.5"/>
</node>
<node client_id="Exchange-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="neowise-lyon"/>
- <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="159.95575221238937" y="102.36842105263158"/>
+ <hardware_type name="dahu-grenoble"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="155.0"
y="76.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>
- <hardware_type name="any-lyon"/>
- <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="377.0"
y="49.5"/>
+ <hardware_type name="dahu-grenoble"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="393.0"
y="33.5"/>
</node>
<node client_id="EProxy-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="neowise-lyon"/>
- <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="171.1061946902655" y="165.55263157894737"/>
+ <hardware_type name="dahu-grenoble"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="157.5"
y="155.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="any-lyon"/>
- <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="728.6283185840708" y="117.84210526315789"/>
+ <hardware_type name="dahu-grenoble"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="689.5"
y="75.5"/>
</node>
<node client_id="Merchant-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>
- <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="910.2212389380531" y="48.21052631578947"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="861.5"
y="34.5"/>
</node>
<node client_id="DNS" 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="dahu-grenoble"/>
- <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="716.4159292035399" y="49.5"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="679.0"
y="35.5"/>
</node>
<node client_id="Aggregator" 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="any-lyon"/>
- <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="570.3982300884957" y="49.5"/>
+ <hardware_type name="dahu-grenoble"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="541.5"
y="35.5"/>
</node>
<node client_id="Wirewatch" 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="any-lyon"/>
- <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="568.2743362831859" y="99.78947368421052"/>
+ <hardware_type name="dahu-grenoble"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="539.5"
y="74.5"/>
</node>
<node client_id="Transfer" 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="any-lyon"/>
- <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="559.778761061947" y="153.94736842105263"/>
+ <hardware_type name="dahu-grenoble"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="531.5"
y="116.5"/>
</node>
<node client_id="Closer" 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="any-lyon"/>
- <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="558.5"
y="201.5"/>
+ <hardware_type name="dahu-grenoble"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="523.5"
y="154.5"/>
</node>
<node client_id="Exchange-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="neowise-lyon"/>
- <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="328.8053097345133" y="102.36842105263158"/>
+ <hardware_type name="dahu-grenoble"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="314.0"
y="76.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>
- <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="75.0"
y="268.4619510579628"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="75.0"
y="205.30722735107315"/>
</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>
- <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="285.77629662820664" y="268.4619510579628"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="273.4810126582279" y="205.30722735107315"/>
</node>
<node client_id="Wallet-3" 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="496.55259325641316" y="268.4619510579628"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="471.9620253164557" y="205.30722735107315"/>
</node>
<node client_id="Wallet-4" 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="696.7699115044248" y="264.8421052631579"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="660.5"
y="202.5"/>
</node>
<node client_id="Wallet-5" 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="911.283185840708" y="264.8421052631579"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="862.5"
y="202.5"/>
</node>
<node client_id="Wallet-6" 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="75.0"
y="308.8969814479059"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="75.0"
y="236.665006020825"/>
</node>
<node client_id="Wallet-7" 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="285.77629662820664" y="308.8969814479059"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="273.4810126582279" y="236.665006020825"/>
</node>
<node client_id="Wallet-8" 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="496.55259325641316" y="308.8969814479059"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="471.9620253164557" y="236.665006020825"/>
</node>
<node client_id="Wallet-9" 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="696.7699115044248" y="306.10526315789474"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="660.5"
y="234.5"/>
</node>
<node client_id="Wallet-10" 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="915.0000000000001" y="307.39473684210526"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="866.0"
y="235.5"/>
</node>
<node client_id="Wallet-11" 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="79.24778761061947" y="349.94736842105266"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="79.0"
y="268.5"/>
</node>
<node client_id="Wallet-12" 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="285.77629662820664" y="349.33201183784905"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="273.4810126582279" y="268.0227846905768"/>
</node>
<node client_id="Wallet-13" 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="502.96460176991155" y="349.94736842105266"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="478.0"
y="268.5"/>
</node>
<node client_id="Wallet-14" 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="701.5486725663717" y="346.07894736842104"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="665.0"
y="265.5"/>
</node>
<node client_id="Wallet-15" 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="913.9380530973452" y="347.36842105263156"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="865.0"
y="266.5"/>
</node>
<node client_id="Wallet-16" 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="82.43362831858407" y="388.63157894736844"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="82.0"
y="298.5"/>
</node>
<node client_id="Wallet-17" 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="285.77629662820664" y="389.76704222779233"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="273.4810126582279" y="299.3805633603287"/>
</node>
<node client_id="Wallet-18" 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="504.02654867256643" y="391.2105263157895"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="479.0"
y="300.5"/>
</node>
<node client_id="Wallet-19" 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="702.6106194690266" y="388.63157894736844"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="666.0"
y="298.5"/>
</node>
<node client_id="Wallet-20" 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="913.9380530973452" y="388.63157894736844"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="865.0"
y="298.5"/>
</node>
<node client_id="Wallet-21" 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="83.49557522123894" y="427.3157894736842"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="83.0"
y="328.5"/>
</node>
<node client_id="Wallet-22" 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="286.3274336283186" y="432.4736842105263"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="274.0"
y="332.5"/>
</node>
<node client_id="Wallet-23" 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="502.5747731600762" y="434.75101353660403"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="477.63291139240505" y="334.26609213042764"/>
</node>
<node client_id="Wallet-24" 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="702.6106194690266" y="431.1842105263158"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="666.0"
y="331.5"/>
</node>
<node client_id="Wallet-25" 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="913.9380530973452" y="427.3157894736842"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="865.0"
y="328.5"/>
</node>
<node client_id="Wallet-26" 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="84.5575221238938" y="466.0"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="84.0"
y="358.5"/>
</node>
<node client_id="Wallet-27" 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="287.3893805309735" y="468.57894736842104"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="275.0"
y="360.5"/>
</node>
<node client_id="Wallet-28" 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="502.9646017699115" y="482.03664955070604"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="477.99999999999994" y="370.93658536585366"/>
</node>
<node client_id="Wallet-29" 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="701.5486725663717" y="473.7368421052632"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="665.0"
y="364.5"/>
</node>
<node client_id="Wallet-30" 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="913.9380530973452" y="468.57894736842104"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="865.0"
y="360.5"/>
</node>
<node client_id="Wallet-31" 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="79.24778761061947" y="508.5526315789474"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="79.0"
y="391.5"/>
</node>
<node client_id="Wallet-32" 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="288.4513274336283" y="509.8421052631579"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="276.0"
y="392.5"/>
</node>
<node client_id="Wallet-33" 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="502.96460176991155" y="522.7368421052631"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="478.0"
y="402.5"/>
</node>
<node client_id="Wallet-34" 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="701.5486725663717" y="517.578947368421"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="665.0"
y="398.5"/>
</node>
<node client_id="Wallet-35" 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="913.9380530973452" y="517.578947368421"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="865.0"
y="398.5"/>
</node>
<node client_id="Wallet-36" 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="80.30973451327434" y="549.8157894736842"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="80.0"
y="423.5"/>
</node>
<node client_id="Wallet-37" 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="289.5132743362832" y="557.5526315789474"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="277.0"
y="429.5"/>
</node>
<node client_id="Wallet-38" 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="505.08849557522126" y="564.0"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="480.0"
y="434.5"/>
</node>
<node client_id="Wallet-39" 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="701.5486725663717" y="561.421052631579"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="665.0"
y="432.5"/>
</node>
<node client_id="Wallet-40" 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="913.9380530973452" y="560.1315789473684"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="865.0"
y="431.5"/>
</node>
<node client_id="EProxy-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="neowise-lyon"/>
- <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1"
x="324.0265486725664" y="164.26315789473685"/>
+ <hardware_type name="dahu-grenoble"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="157.5"
y="120.5"/>
+ </node>
+ <node client_id="EProxy-3" 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="dahu-grenoble"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="317.5"
y="119.5"/>
+ </node>
+ <node client_id="EProxy-4" 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="dahu-grenoble"/>
+ <location xmlns="http://jfed.iminds.be/rspec/ext/jfed/1" x="318.5"
y="155.5"/>
</node>
</rspec>
\ No newline at end of file
diff --git a/configs/etc/monitor/promtail.yaml
b/configs/etc/monitor/promtail.yaml
index d4d0e7b..f87698d 100644
--- a/configs/etc/monitor/promtail.yaml
+++ b/configs/etc/monitor/promtail.yaml
@@ -166,7 +166,7 @@ scrape_configs:
selector: '{job="fakebank"} |~ "Making(.*)"'
stages:
- regex:
- expression: 'Making transfer \d+.*to (?P<account>[A-Za-z0-9-_]+)'
+ expression: 'Making transfer \d*.*to (?P<account>[A-Za-z0-9-_]+)'
- labels:
account:
- metrics:
diff --git a/configs/etc/taler/conf.d/exchange-business.conf
b/configs/etc/taler/conf.d/exchange-business.conf
index 6697b67..9de74eb 100644
--- a/configs/etc/taler/conf.d/exchange-business.conf
+++ b/configs/etc/taler/conf.d/exchange-business.conf
@@ -15,6 +15,6 @@ AGGREGATOR_SHARD_SIZE = <AGGREGATOR_SHARD_SIZE_HERE>
enable_credit = yes
enable_debit = yes
-payto_uri = payto://x-taler-bank/<BANK_HOST_HERE>/Exchange
+payto_uri =
payto://x-taler-bank/<BANK_HOST_HERE>/exchange?receiver-name=exchange
@inline-secret@ exchange-accountcredentials-1
../secrets/exchange-accountcredentials.secret.conf
diff --git a/configs/etc/taler/secrets/exchange-accountcredentials.secret.conf
b/configs/etc/taler/secrets/exchange-accountcredentials.secret.conf
index e9f3e35..13e49d5 100644
--- a/configs/etc/taler/secrets/exchange-accountcredentials.secret.conf
+++ b/configs/etc/taler/secrets/exchange-accountcredentials.secret.conf
@@ -12,6 +12,6 @@
wire_gateway_auth_method = basic
password = x
-username = Exchange
-wire_gateway_url = http://<BANK_HOST_HERE>/Exchange/
+username = exchange
+wire_gateway_url = http://<BANK_HOST_HERE>/exchange/
diff --git a/experiment/scripts/benchmark.sh b/experiment/scripts/benchmark.sh
index bd02773..4466923 100755
--- a/experiment/scripts/benchmark.sh
+++ b/experiment/scripts/benchmark.sh
@@ -40,26 +40,29 @@ function start_wallet_bench() {
--config-json "
{
\"exchange\": \"${PROTO}://${EXCHANGE_GW_DOMAIN}/\",
- \"bank\": \"http://bank.${DNS_ZONE}/\",
+ \"bank\": \"${PROTO}://bank.${DNS_ZONE}/\",
\"currency\": \"KUDOS\",
- \"paytoTemplate\":
\"payto://x-taler-bank/bank.${DNS_ZONE}/merchant-\${id}\",
+ \"paytoTemplate\":
\"payto://x-taler-bank/bank.${DNS_ZONE}/merchant-\${id}?receiver-name=merchant\",
\"randomAlg\": \"${WALLET_MERCHANT_SELECTION}\",
\"numMerchants\": ${WALLET_NUM_MERCHANTS},
- \"iterations\": 100000,
+ \"iterations\": 1000,
\"deposits\": ${NUM_DEPOSITS},
\"restartAfter\": 2
}"
else
+ if [[ "${WALLET_BENCHMARK}" == bench3 ]]; then
+ WALLET_BENCHMARK=bench1
+ fi
taler-wallet-cli \
-L ${LOG_LEVEL} \
advanced ${WALLET_BENCHMARK} \
--config-json "
{
\"exchange\": \"${PROTO}://${EXCHANGE_GW_DOMAIN}/\",
- \"bank\": \"http://bank.${DNS_ZONE}/\",
+ \"bank\": \"${PROTO}://bank.${DNS_ZONE}/\",
\"currency\": \"KUDOS\",
- \"payto\": \"payto://x-taler-bank/bank.${DNS_ZONE}/merchant-1\",
- \"iterations\": 100000,
+ \"payto\":
\"payto://x-taler-bank/bank.${DNS_ZONE}/merchant-1?receiver-name=merchant-1\",
+ \"iterations\": 1000,
\"deposits\": ${NUM_DEPOSITS},
\"restartAfter\": 2
}"
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index 535188f..17fb0ab 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -209,7 +209,8 @@ function setup_config() {
max_parallel_maintenance_workers=12
# out of shared memory
- max_locks_per_transaction=120
+ max_locks_per_transaction=200
+ max_pred_locks_per_transaction=200
# (max used =~ work_mem * max_connections)
# NOTE: This formula is not completely correct
diff --git a/experiment/scripts/exchange.sh b/experiment/scripts/exchange.sh
index a887ae2..38d46e9 100755
--- a/experiment/scripts/exchange.sh
+++ b/experiment/scripts/exchange.sh
@@ -85,7 +85,7 @@ function setup_primary_exchange() {
taler-exchange-offline download > sig-req.json
taler-exchange-offline sign < sig-req.json > sig-res.json
- taler-exchange-offline enable-account
"payto://x-taler-bank/bank.${DNS_ZONE}/Exchange" > acct-res.json
+ taler-exchange-offline enable-account
"payto://x-taler-bank/bank.${DNS_ZONE}/exchange?receiver-name=exchange" >
acct-res.json
taler-exchange-offline wire-fee $(date +%Y) x-taler-bank KUDOS:0 KUDOS:0
KUDOS:0 > fee-res.json
taler-exchange-offline upload < sig-res.json
taler-exchange-offline upload < acct-res.json
diff --git a/experiment/scripts/merchant.sh b/experiment/scripts/merchant.sh
index 80d4c93..1ec68a2 100755
--- a/experiment/scripts/merchant.sh
+++ b/experiment/scripts/merchant.sh
@@ -68,7 +68,7 @@ function create_instance() {
-H "Authorization: Bearer secret-token:${TALER_MERCHANT_TOKEN}" \
-H "Content-Type: application/json" \
-d "{
- \"payto_uris\": [ \"payto://x-taler-bank/bank.${DNS_ZONE}/${1}\"
],
+ \"payto_uris\": [
\"payto://x-taler-bank/bank.${DNS_ZONE}/${1}?receiver-name=${1}\" ],
\"id\": \"${1}\",
\"name\": \"${1}\",
\"address\": {\"country\": \"CH\"},
diff --git a/experiment/scripts/postgres-cluster/exch-cluster.sh
b/experiment/scripts/postgres-cluster/exch-cluster.sh
index 9500dc4..fbd2176 100755
--- a/experiment/scripts/postgres-cluster/exch-cluster.sh
+++ b/experiment/scripts/postgres-cluster/exch-cluster.sh
@@ -46,7 +46,7 @@ sleep 5
taler-exchange-offline download > sig-req.json
taler-exchange-offline sign < sig-req.json > sig-res.json
-taler-exchange-offline enable-account
"payto://x-taler-bank/bank.${DNS_ZONE}/Exchange" > acct-res.json
+taler-exchange-offline enable-account
"payto://x-taler-bank/bank.${DNS_ZONE}/exchange?receiver-name=exchange" >
acct-res.json
taler-exchange-offline wire-fee $(date +%Y) x-taler-bank KUDOS:0 KUDOS:0
KUDOS:0 > fee-res.json
taler-exchange-offline upload < sig-res.json
taler-exchange-offline upload < acct-res.json
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-grid5k] branch master updated (653b702 -> 0c6cce0),
gnunet <=
- [taler-grid5k] 04/11: fix, gnunet, 2022/06/05
- [taler-grid5k] 03/11: do not restart to get measures of aggregator, gnunet, 2022/06/05
- [taler-grid5k] 02/11: missing id in old logs, gnunet, 2022/06/05
- [taler-grid5k] 05/11: fix, gnunet, 2022/06/05
- [taler-grid5k] 11/11: Merge branch 'node-setup', gnunet, 2022/06/05
- [taler-grid5k] 08/11: add receiver-name to all accounts, gnunet, 2022/06/05
- [taler-grid5k] 07/11: fix, gnunet, 2022/06/05
- [taler-grid5k] 01/11: change to receiver, gnunet, 2022/06/05
- [taler-grid5k] 06/11: test wire_gateway, gnunet, 2022/06/05
- [taler-grid5k] 09/11: restore wallet service, gnunet, 2022/06/05