Merge pull request #15 from ClickHouse/victoria-lifecycle

Fix misuse of installation script as cleanup script

Author: rschu1ze

victorialogs/drop_tables.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+echo "Stopping VictoriaLogs"
+pidof victoria-logs-prod && kill `pidof victoria-logs-prod`
+
+echo "Dropping all data"
+rm -rf victoria-logs-data

victorialogs/install.sh

@@ -2,26 +2,5 @@
 
 RELEASE_VERSION=v1.10.1-victorialogs
 
-# stop the existing victorialogs instance if any and drop its data
-while true
-do
-    pidof victoria-logs-prod && kill `pidof victoria-logs-prod` || break
-    sleep 1
-done
-rm -rf victoria-logs-data
-
-# download victorialogs
 wget -N https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/${RELEASE_VERSION}/victoria-logs-linux-amd64-${RELEASE_VERSION}.tar.gz
 tar xzf victoria-logs-linux-amd64-${RELEASE_VERSION}.tar.gz
-echo "Downloaded victorialogs."
-
-# start victorialogs
-./victoria-logs-prod -loggerOutput=stdout -retentionPeriod=20y -search.maxQueryDuration=5m > server.log &
-
-while true
-do
-    curl -s --fail http://localhost:9428/select/logsql/query -d 'query=_time:2100-01-01Z' && break
-    sleep 1
-done
-
-echo "Started victorialogs."

victorialogs/main.sh

@@ -27,11 +27,12 @@ echo "4) 1000m"
 echo "5) all"
 read -p "Enter the number corresponding to your choice: " choice
 
+./install.sh
+
 benchmark() {
     local size=$1
 
-    # install is needed here in order to drop the previously ingested data
-    ./install.sh
+    ./start.sh
 
     ./load_data.sh "$DATA_DIRECTORY" "$size" "$SUCCESS_LOG" "$ERROR_LOG"
 
@@ -44,6 +45,8 @@ benchmark() {
     ./count.sh | tee "${OUTPUT_PREFIX}_bluesky_${size}m.count"
     #./query_results.sh | tee "${OUTPUT_PREFIX}_bluesky_${size}m.query_results"
     ./run_queries.sh | tee "${OUTPUT_PREFIX}_bluesky_${size}m.results_runtime"
+
+    ./drop_tables.sh # also stops VictoriaLogs
 }
 
 case $choice in

victorialogs/start.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Do we run already?
+pidof victoria-logs-prod >/dev/null && exit 1
+
+echo "Starting VictoriaLogs"
+./victoria-logs-prod -loggerOutput=stdout -retentionPeriod=20y -search.maxQueryDuration=5m > server.log &