[taler-grid5k] 151/189: add progress for archiving

[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 a2aecca9a1bb1fe96db0ba57991bb0bbdce1bb78
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Thu Apr 14 21:23:03 2022 +0200

    add progress for archiving
---
 additional/grafana/exchange.json | 33 +++++++++++++++++++++------------
 additional/persist.sh            |  6 ++++--
 experiment/scripts/dns.sh        |  4 ++--
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/additional/grafana/exchange.json b/additional/grafana/exchange.json
index 93ce003..e60c581 100644
--- a/additional/grafana/exchange.json
+++ b/additional/grafana/exchange.json
@@ -800,6 +800,15 @@
         }
       ],
       "title": "Slow Query Distribution",
+      "transformations": [
+        {
+          "id": "renameByRegex",
+          "options": {
+            "regex": "(.*)",
+            "renamePattern": "$1 ms"
+          }
+        }
+      ],
       "type": "bargauge"
     },
     {
@@ -871,7 +880,7 @@
           "refId": "A"
         }
       ],
-      "title": "Min",
+      "title": "Min [5m]",
       "type": "stat"
     },
     {
@@ -942,7 +951,7 @@
           "refId": "A"
         }
       ],
-      "title": "Average",
+      "title": "Average [5m]",
       "type": "stat"
     },
     {
@@ -1014,7 +1023,7 @@
           "refId": "A"
         }
       ],
-      "title": "Max",
+      "title": "Max [5m]",
       "type": "stat"
     },
     {
@@ -1022,7 +1031,7 @@
         "type": "datasource",
         "uid": "-- Mixed --"
       },
-      "description": "Number of queries which took longer than the configured 
duration",
+      "description": "Number of queries which took longer than the configured 
duration in the last 5 minutes",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -1072,13 +1081,13 @@
             "type": "loki",
             "uid": "${DS_LOKI}"
           },
-          "expr": "sum(count_over_time({app=\"taler-database\", 
type=\"slow-query\"} [$__range]))",
+          "expr": "sum(count_over_time({app=\"taler-database\", 
type=\"slow-query\"} [5m]))",
           "instant": true,
           "range": false,
           "refId": "A"
         }
       ],
-      "title": "Total Slow Queries",
+      "title": "Total Slow Queries [5m]",
       "type": "stat"
     },
     {
@@ -1142,14 +1151,14 @@
             "uid": "${DS_PROMETHEUS}"
           },
           "exemplar": false,
-          "expr": "histogram_quantile(0.5, 
rate(taler_database_slow_query_duration_hist_bucket{}[$__range]))",
+          "expr": "histogram_quantile(0.5, 
rate(taler_database_slow_query_duration_hist_bucket{}[5m]))",
           "instant": true,
           "interval": "",
           "legendFormat": "",
           "refId": "A"
         }
       ],
-      "title": "Median",
+      "title": "Median [5m]",
       "type": "stat"
     },
     {
@@ -1221,7 +1230,7 @@
           "refId": "A"
         }
       ],
-      "title": "Stddev",
+      "title": "Stddev [5m]",
       "type": "stat"
     },
     {
@@ -1292,7 +1301,7 @@
           "refId": "A"
         }
       ],
-      "title": "90th Percentile",
+      "title": "90th Percentile [5m]",
       "type": "stat"
     },
     {
@@ -1363,7 +1372,7 @@
           "refId": "A"
         }
       ],
-      "title": "99th Percentile",
+      "title": "99th Percentile [5m]",
       "type": "stat"
     },
     {
@@ -1524,6 +1533,6 @@
   "timezone": "",
   "title": "Exchange",
   "uid": "NYO0EIE7k",
-  "version": 35,
+  "version": 38,
   "weekStart": ""
 }
\ No newline at end of file
diff --git a/additional/persist.sh b/additional/persist.sh
index f31a7c1..5820579 100755
--- a/additional/persist.sh
+++ b/additional/persist.sh
@@ -51,9 +51,11 @@ BACKUP_DIR="archives"
 
 G5K_BACKUP="g5k-$(date +%s).tar.gz"
 
-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'
+echo "Creating archive, this can take some time"
+ssh g5k 'rm -rf grenoble/g5k.tar* && find . -type l -exec tar 
--ignore-failed-read -rvf grenoble/g5k.tar -C {} taler-perf exp-data 
espec-times \; && pv grenoble/g5k.tar | gzip > grenoble/g5k.tar.gz'
 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 \;)'
+echo "Cleaning up g5k storage"
+ssh g5k 'rm grenoble/g5k.tar.gz && $(find . -type l -exec rm -rf 
{}/taler-perf/ {}/exp-data {}/espec-times \;)'
 
 test -d ${BACKUP_DIR} || mkdir ${BACKUP_DIR}
 
diff --git a/experiment/scripts/dns.sh b/experiment/scripts/dns.sh
index 13facc2..3ad4e72 100755
--- a/experiment/scripts/dns.sh
+++ b/experiment/scripts/dns.sh
@@ -5,9 +5,9 @@ set -eux
 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
+  echo "# Times to use for recovery" > /home/${G5K_USER}/espec-times
 fi
-echo "$(date +%s)" >> ${LOG_DIR}/espec-times
+echo "$(date +%s)" >> /home/${G5K_USER}/espec-times
 
 # Clean the file so it is cleanly updated in each run
 rm ${LOG_DIR}/commits.txt || true

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