[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-grid5k] 144/189: possible to provide the complete tar archive for
From: |
gnunet |
Subject: |
[taler-grid5k] 144/189: possible to provide the complete tar archive for recovery |
Date: |
Thu, 28 Apr 2022 10:48:34 +0200 |
This is an automated email from the git hooks/post-receive script.
marco-boss pushed a commit to branch master
in repository grid5k.
commit 22d35f6f0aebc7b5f11e16f46bd8f0553a80e325
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Wed Apr 13 09:48:49 2022 +0200
possible to provide the complete tar archive for recovery
---
additional/.gitignore | 2 +-
additional/persist.sh | 2 +-
additional/recover/run.sh | 19 +++++++++++++++----
experiment/scripts/benchmark.sh | 4 ++--
experiment/scripts/database.sh | 4 ++++
5 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/additional/.gitignore b/additional/.gitignore
index d39e452..675830d 100644
--- a/additional/.gitignore
+++ b/additional/.gitignore
@@ -1,3 +1,3 @@
plotter
-*.tar.gz
+*.tar*
*.log
diff --git a/additional/persist.sh b/additional/persist.sh
index 5eeb034..f1284fd 100755
--- a/additional/persist.sh
+++ b/additional/persist.sh
@@ -51,7 +51,7 @@ BACKUP_DIR="archives"
G5K_BACKUP="g5k-$(date +%s).tar.gz"
-ssh g5k 'find . -type l -exec tar --ignore-failed-read -rvf grenoble/g5k.tar
-C {} taler-perf exp-data \; && gzip grenoble/gk5.tar'
+ssh g5k 'rm -rf grenoble/g5k.tar* && find . -type l -exec tar
--ignore-failed-read -rvf grenoble/g5k.tar -C {} taler-perf exp-data \; && gzip
grenoble/g5k.tar'
scp g5k:~/grenoble/g5k.tar.gz ${G5K_BACKUP}
ssh g5k 'rm grenoble/g5k.tar.gz && $(find . -type l -exec rm -rf
{}/taler-perf/ {}/exp-data \;)'
diff --git a/additional/recover/run.sh b/additional/recover/run.sh
index cf50c77..0a7459c 100755
--- a/additional/recover/run.sh
+++ b/additional/recover/run.sh
@@ -4,20 +4,31 @@
# with a data (prometheus and loki) snapshot of an experiment
if [[ -z ${1} ]]; then
- echo "Usage: run.sh DATA_SNAPSHOT_ARCHIVE"
+ echo "Usage: run.sh EXPERIMENT_ARCHIVE || EXPERIMENT_DATA_FOLDER"
exit 1
fi
TMP_BASEDIR=/tmp/taler-perf
+rm -rf ${TMP_BASEDIR} || true
export LOKI_DATA="${TMP_BASEDIR}/loki"
export PROMETHEUS_DATA="${TMP_BASEDIR}/prometheus"
export DASHBOARDS_DIR="${TMP_BASEDIR}/dashboards"
-mkdir -p ${DASHBOARDS_DIR} || true
-rm -rf ${TMP_BASEDIR} || true
+EXP_DATA=${1}
+
+if file ${EXP_DATA} | grep -q 'tar archive'; then
+ G5K_ARCHIVE=$(tar -t -f ${EXP_DATA} | grep 'g5k')
+ tar -xvf ${EXP_DATA} -C /tmp ${G5K_ARCHIVE}
+ tar -xvf /tmp/${G5K_ARCHIVE} -C /tmp exp-data
+ rm -rf /tmp/${G5K_ARCHIVE}
+ EXP_DATA=/tmp/exp-data
+ mv ${EXP_DATA} ${TMP_BASEDIR}
+else
+ cp -r ${EXP_DATA} ${TMP_BASEDIR}
+fi
-cp -r ${1} ${TMP_BASEDIR}
+mkdir ${DASHBOARDS_DIR} || true
# load the times to adjust the grafana dashboards
source "${TMP_BASEDIR}/times.env"
diff --git a/experiment/scripts/benchmark.sh b/experiment/scripts/benchmark.sh
index 812c825..a79cc7a 100755
--- a/experiment/scripts/benchmark.sh
+++ b/experiment/scripts/benchmark.sh
@@ -35,11 +35,11 @@ function start_wallet_bench() {
\"currency\": \"KUDOS\",
\"payto\": \"payto://x-taler-bank/bank.${DNS_ZONE}/foo\",
\"iterations\": 100000,
- \"deposits\": 0,
+ \"deposits\": $((RANDOM %21)),
\"restartAfter\": 2
}"
}
-# $((RANDOM %21)),
+
case $1 in
[0-9]*)
start_wallet_bench $1
diff --git a/experiment/scripts/database.sh b/experiment/scripts/database.sh
index 3ae2866..9f438f6 100755
--- a/experiment/scripts/database.sh
+++ b/experiment/scripts/database.sh
@@ -254,6 +254,10 @@ psql -d "${DB_NAME}" -tAc "CREATE USER MAPPING IF NOT
EXISTS FOR \"${DB_USER}\"
SERVER \"${i}\"
OPTIONS (user '${DB_USER}', password
'${DB_PASSWORD}');"
EOF
+# Only in pg 14
+# for in $(seq $NUM_SHARDS); do
+# psql -d "${DB_NAME}" -tAc "ALTER SERVER ${i} OPTIONS (async_capable
"true");
+# done
done
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-grid5k] 153/189: show that process is running in persist.sh for long during processes, (continued)
- [taler-grid5k] 153/189: show that process is running in persist.sh for long during processes, gnunet, 2022/04/28
- [taler-grid5k] 143/189: fixes, changes, gnunet, 2022/04/28
- [taler-grid5k] 161/189: add centos image, gnunet, 2022/04/28
- [taler-grid5k] 131/189: fix backup script, gnunet, 2022/04/28
- [taler-grid5k] 127/189: adjust database logs, gnunet, 2022/04/28
- [taler-grid5k] 166/189: use centos for db only, gnunet, 2022/04/28
- [taler-grid5k] 141/189: update recovery script, gnunet, 2022/04/28
- [taler-grid5k] 160/189: update image, disable mitigations, gnunet, 2022/04/28
- [taler-grid5k] 154/189: more dynamic rsyslog ports, add some info in setup.sh, gnunet, 2022/04/28
- [taler-grid5k] 189/189: Commented and Documented, gnunet, 2022/04/28
- [taler-grid5k] 144/189: possible to provide the complete tar archive for recovery,
gnunet <=
- [taler-grid5k] 149/189: update proxy configuration for merchant and bank, gnunet, 2022/04/28
- [taler-grid5k] 145/189: add some doc, gnunet, 2022/04/28
- [taler-grid5k] 162/189: add centos image, gnunet, 2022/04/28
- [taler-grid5k] 186/189: rebuild on all nodes, gnunet, 2022/04/28
- [taler-grid5k] 176/189: fix node-exporter, gnunet, 2022/04/28
- [taler-grid5k] 155/189: experiment with two postgresql instances, gnunet, 2022/04/28
- [taler-grid5k] 157/189: fix persist script, delete manually, gnunet, 2022/04/28
- [taler-grid5k] 151/189: add progress for archiving, gnunet, 2022/04/28
- [taler-grid5k] 135/189: add loki to recover setup, gnunet, 2022/04/28
- [taler-grid5k] 175/189: postgresql not loaded per default, gnunet, 2022/04/28