[taler-grid5k] 143/189: fixes, changes

[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 6aa0b1ce2d9c191dc2fb937a24a7a4190a68ebfd
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Tue Apr 12 17:27:43 2022 +0200

    fixes, changes
---
 additional/persist.sh             | 8 ++++----
 experiment/scripts/data-backup.sh | 3 ++-
 experiment/scripts/dns.sh         | 5 +++++
 experiment/scripts/monitor.sh     | 1 +
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/additional/persist.sh b/additional/persist.sh
index 9e72e9d..5eeb034 100755
--- a/additional/persist.sh
+++ b/additional/persist.sh
@@ -46,20 +46,20 @@ NAME=$(\
   sed -r s/^-+\|-+$//g | \
   tr A-Z a-z \
 )
-BACKUP_NAME="${NAME}-$(date +%d-%m-%y).tar.gz"
+BACKUP_NAME="${NAME}-$(date +%d-%m-%y).tar"
 BACKUP_DIR="archives"
 
 G5K_BACKUP="g5k-$(date +%s).tar.gz"
 
-ssh g5k 'tar --ignore-failed-read -czvf grenoble/g5k.tar.gz $(find . -type l 
-exec echo "{}/taler-perf/" \;)'
+ssh g5k 'find . -type l -exec tar --ignore-failed-read -rvf grenoble/g5k.tar 
-C {} taler-perf exp-data \; && gzip grenoble/gk5.tar'
 scp g5k:~/grenoble/g5k.tar.gz ${G5K_BACKUP}
-ssh g5k 'rm grenoble/g5k.tar.gz && $(find . -type l -exec rm -rf 
"{}/taler-perf/" \;)'
+ssh g5k 'rm grenoble/g5k.tar.gz && $(find . -type l -exec rm -rf 
{}/taler-perf/ {}/exp-data \;)'
 
 test -d ${BACKUP_DIR} || mkdir ${BACKUP_DIR}
 
 echo "Creating Backup Tar ${BACKUP_DIR}/${BACKUP_NAME}"
 
-tar -czvf ${BACKUP_DIR}/${BACKUP_NAME} ${G5K_BACKUP} ${2}
+tar -cvf ${BACKUP_DIR}/${BACKUP_NAME} ${G5K_BACKUP} ${2}
 
 rm ${G5K_BACKUP} ${2}
 
diff --git a/experiment/scripts/data-backup.sh 
b/experiment/scripts/data-backup.sh
index cf497a4..ed31ef5 100755
--- a/experiment/scripts/data-backup.sh
+++ b/experiment/scripts/data-backup.sh
@@ -15,7 +15,7 @@ fi
 
 PROMETHEUS_DATA_DIR=/var/lib/prometheus/metrics2/snapshots
 
-SNAPSHOT_COPY_PATH=${LOG_DIR}/tmp-data-snapshot
+SNAPSHOT_COPY_PATH=${EXPERIMENT_DATA_DIR}/prometheus-tmp
 SNAPSHOT_PATH=${EXPERIMENT_DATA_DIR}/prometheus
 
 END_TIME=$(date +%s)
@@ -29,6 +29,7 @@ SNAPSHOT="${PROMETHEUS_DATA_DIR}/$(\
 
 # copy first because its nfs, when copied remove the previous one
 cp -r "${SNAPSHOT}" "${SNAPSHOT_COPY_PATH}"
+rm -rf "${SNAPSHOT_PATH}"
 mv "${SNAPSHOT_COPY_PATH}" "${SNAPSHOT_PATH}"
 
 # export timestamps for the recover script in g5k-repo/additional
diff --git a/experiment/scripts/dns.sh b/experiment/scripts/dns.sh
index 7e9f711..13facc2 100755
--- a/experiment/scripts/dns.sh
+++ b/experiment/scripts/dns.sh
@@ -4,6 +4,11 @@ set -eux
 # Backup used nodes for experiment
 cp ~/nodes.json ${LOG_DIR}/nodes.json
 
+if ! grep -q "# Times" ${LOG_DIR}/espec-times; then
+  echo "# Times to use for recovery" > ${LOG_DIR}/espec-times
+fi
+echo "$(date +%s)" >> ${LOG_DIR}/espec-times
+
 # Clean the file so it is cleanly updated in each run
 rm ${LOG_DIR}/commits.txt || true
 
diff --git a/experiment/scripts/monitor.sh b/experiment/scripts/monitor.sh
index b85810c..2b9843e 100755
--- a/experiment/scripts/monitor.sh
+++ b/experiment/scripts/monitor.sh
@@ -98,6 +98,7 @@ function setup_data_dir() {
   mkdir ${EXPERIMENT_DATA_DIR} || true
 
   echo "EXPERIMENT_DATA_DIR=${EXPERIMENT_DATA_DIR}" >> ~/.env
+  echo "EXPERIMENT_DATA_DIR=${EXPERIMENT_DATA_DIR}" >> /etc/environment
 
   sed -i "s|<EXPERIMENT_DATA_PATH_HERE>|${EXPERIMENT_DATA_DIR}|g" \
          /etc/monitor/loki.yaml

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