[taler-grid5k] 01/48: add shard user and domain in taler config

[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 14ac82c3fe4ab1614103c2df681513555714825d
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Mon May 2 00:30:02 2022 +0200

    add shard user and domain in taler config
---
 configs/etc/taler/conf.d/exchange-business.conf   |  2 ++
 configs/etc/taler/secrets/exchange-db.secret.conf |  3 +++
 experiment/scripts/database.sh                    | 17 +++++++++--------
 experiment/scripts/helpers.sh                     |  5 ++++-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/configs/etc/taler/conf.d/exchange-business.conf 
b/configs/etc/taler/conf.d/exchange-business.conf
index ee3458a..6697b67 100644
--- a/configs/etc/taler/conf.d/exchange-business.conf
+++ b/configs/etc/taler/conf.d/exchange-business.conf
@@ -2,6 +2,8 @@
 
 MASTER_PUBLIC_KEY = <MASTER_KEY_HERE>
 
+SHARD_DOMAIN = <SHARD_DOMAIN_HERE>
+
 BASE_URL = <BASE_URL_HERE>
 
 MAX_REQUESTS = <MAX_REQUESTS_HERE>
diff --git a/configs/etc/taler/secrets/exchange-db.secret.conf 
b/configs/etc/taler/secrets/exchange-db.secret.conf
index cb52d0a..68915ff 100644
--- a/configs/etc/taler/secrets/exchange-db.secret.conf
+++ b/configs/etc/taler/secrets/exchange-db.secret.conf
@@ -8,3 +8,6 @@ CONFIG=<DB_URL_HERE>
 
 # The details of the URI depend on where the database lives and how
 # access control was configured.
+
+SHARD_REMOTE_USER=<SHARD_USER_HERE>
+SHARD_REMOTE_USER_PW=<SHARD_USER_PW_HERE>
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index 736efb9..de75384 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -59,11 +59,13 @@ function setup_config() {
     mv /var/lib/postgresql /tmp/
   fi
 
-  sed -i "s\<DB_URL_HERE>\postgresql:///${DB_NAME}\g" \
+  sed -i -e "s\<DB_URL_HERE>\postgresql:///${DB_NAME}\g" \
+         -e "s/<SHARD_USER_HERE>/${DB_USER}/g" \
+        -e "s/<SHARD_USER_PW_HERE>/${DB_PASSWORD}/g" \
        /etc/taler/secrets/exchange-db.secret.conf
   
   # Get hardware info to tune in postgresql.conf
-  SHARED_MEM=$(($(awk '/MemTotal/ {print $2}' /proc/meminfo) / 3 ))
+  SHARED_MEM=$(($(awk '/MemTotal/ {print $2}' /proc/meminfo) / 4 ))
   CACHE_SIZE=$(($(awk '/MemTotal/ {print $2}' /proc/meminfo) * 3/4))
   NUM_CPU=$(lscpu | grep "CPU(s)" | head -n 1 | awk '{print $2}')
 
@@ -135,18 +137,14 @@ function setup_config() {
   autovacuum_vacuum_cost_limit=400
   autovacuum_vacuum_scale_factor=0.1
   autovacuum_vacuum_threshold=1000
-
   # Default 50, 0.1
   autovacuum_analyze_threshold=50
   autovacuum_analyze_scale_factor=0.1
 
   # use 25% of the available memory 
   # (https://www.postgresql.org/docs/13/runtime-config-resource.html)
- # shared_buffers=${SHARED_MEM}kB
- # effective_cache_size=${CACHE_SIZE}kB
-  shared_buffers=24551953kB
-  effective_cache_size=75491895kB
-
+  shared_buffers=${SHARED_MEM}kB
+  effective_cache_size=${CACHE_SIZE}kB
 
   huge_pages=on
   
@@ -215,6 +213,9 @@ function setup_config() {
   # Disable sequential scans
   # enable_seqscan=off
 
+  enable_partitionwise_join=on
+  enable_partitionwise_aggregate=on
+
   # set our database location to /tmp
   data_directory='/tmp/postgresql/${POSTGRES_VERSION}/main'
   " > /etc/postgresql/${POSTGRES_VERSION}/main/exchange.conf
diff --git a/experiment/scripts/helpers.sh b/experiment/scripts/helpers.sh
index c972bd9..2388bd1 100755
--- a/experiment/scripts/helpers.sh
+++ b/experiment/scripts/helpers.sh
@@ -138,7 +138,9 @@ function setup_exchange_config_without_master_key() {
 
   AGGREGATOR_SHARD_SIZE=$(echo "2^(30-${NUM_AGGREGATOR_PROCESSES})" | bc)
 
-  sed -i 
"s\<DB_URL_HERE>\postgresql://${DB_USER}:${DB_PASSWORD}@db.${DNS_ZONE}:${DB_PORT}/${DB_NAME}\g"
 \
+  sed -i -e 
"s\<DB_URL_HERE>\postgresql://${DB_USER}:${DB_PASSWORD}@db.${DNS_ZONE}:${DB_PORT}/${DB_NAME}\g"
 \
+         -e "s/<SHARD_USER_HERE>/${DB_USER}/g" \
+        -e "s/<SHARD_USER_PW_HERE>/${DB_PASSWORD}/g" \
        /etc/taler/secrets/exchange-db.secret.conf
 
   sed -i -e "s/<EXCHANGE_CIPHER_HERE>/${EXCHANGE_CIPHER}/g" \
@@ -152,6 +154,7 @@ function setup_exchange_config_without_master_key() {
          -e "s\<BASE_URL_HERE>\http://${NODE_NAME}.${DNS_ZONE}:10000/\g"; \
          -e "s/<MAX_REQUESTS_HERE>/${EXCHANGE_MAX_REQUESTS:-8192}/g" \
          -e "s/<AGGREGATOR_SHARD_SIZE_HERE>/${AGGREGATOR_SHARD_SIZE}/g" \
+        -e "s/<SHARD_DOMAIN_HERE>/${DNS_ZONE}/g" \
        /etc/taler/conf.d/exchange-business.conf
 
   sed -i "s/<LOOKAHEAD_SIGN_HERE>/${LOOKAHEAD_SIGN}/g" \

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