refactor to use state dir in run dir

coder · mafredri · Sep 15, 2023 · Sep 13, 2023 · Sep 13, 2023 · Sep 13, 2023
commit 059988e106b157c5079ddb2f51fc3b79a5e431bc
diff --git a/scaletest/templates/scaletest-runner/metadata_phase.sh b/scaletest/templates/scaletest-runner/metadata_phase.sh
@@ -3,13 +3,4 @@
 # shellcheck disable=SC2153 source=scaletest/templates/scaletest-runner/scripts/lib.sh
 . "${SCRIPTS_DIR}/lib.sh"
 
-if [[ -f "${SCALETEST_PHASE_FILE}" ]]; then
-	phase_raw="$(tail -n1 "${SCALETEST_PHASE_FILE}")"
-	phase="$(echo "${phase_raw}" | cut -d' ' -f3-)"
-	if [[ ${phase_raw} == *"END:"* ]]; then
-		phase+=" (done)"
-	fi
-	echo "${phase}"
-else
-	echo "None"
-fi
+get_phase
diff --git a/scaletest/templates/scaletest-runner/metadata_status.sh b/scaletest/templates/scaletest-runner/metadata_status.sh
@@ -1,14 +1,6 @@
 #!/bin/bash
 
-# Order of importance (reverse of creation).
-if [[ -f /tmp/.scaletest_failed ]]; then
-	echo "Failed"
-elif [[ -f /tmp/.scaletest_complete ]]; then
-	echo "Complete"
-elif [[ -f /tmp/.scaletest_running ]]; then
-	echo "Running"
-elif [[ -f /tmp/.scaletest_preparing ]]; then
-	echo "Preparing"
-else
-	echo "Not started"
-fi
+# shellcheck disable=SC2153 source=scaletest/templates/scaletest-runner/scripts/lib.sh
+. "${SCRIPTS_DIR}/lib.sh"
+
+get_status
diff --git a/scaletest/templates/scaletest-runner/scripts/lib.sh b/scaletest/templates/scaletest-runner/scripts/lib.sh
@@ -12,7 +12,8 @@ fi
 . ~/coder/scripts/lib.sh
 
 # Environment variables shared between scripts.
-SCALETEST_PHASE_FILE=/tmp/.scaletest_phase
+SCALETEST_STATE_DIR="${SCALETEST_RUN_DIR}/state"
+SCALETEST_PHASE_FILE="${SCALETEST_STATE_DIR}/phase"
 
 coder() {
 	maybedryrun "$DRY_RUN" command coder "${@}"
@@ -22,6 +23,21 @@ show_json() {
 	maybedryrun "$DRY_RUN" jq 'del(.. | .logs?)' "${1}"
 }
 
+set_status() {
+	echo "$*" >"${SCALETEST_STATE_DIR}/status"
+}
+lock_status() {
+	chmod 0440 "${SCALETEST_STATE_DIR}/status"
+}
+get_status() {
+	# Order of importance (reverse of creation).
+	if [[ -f "${SCALETEST_STATE_DIR}/status" ]]; then
+		cat "${SCALETEST_STATE_DIR}/status"
+	else
+		echo "Not started"
+	fi
+}
+
 phase_num=0
 start_phase() {
 	((phase_num++))
@@ -37,6 +53,18 @@ end_phase() {
 	log "End phase ${phase_num}: ${phase}"
 	echo "$(date -Iseconds) END:${phase_num}: ${phase}" >>"${SCALETEST_PHASE_FILE}"
 }
+get_phase() {
+	if [[ -f "${SCALETEST_PHASE_FILE}" ]]; then
+		phase_raw="$(tail -n1 "${SCALETEST_PHASE_FILE}")"
+		phase="$(echo "${phase_raw}" | cut -d' ' -f3-)"
+		if [[ ${phase_raw} == *"END:"* ]]; then
+			phase+=" (done)"
+		fi
+		echo "${phase}"
+	else
+		echo "None"
+	fi
+}
 
 wait_baseline() {
 	s=${1:-2}

diff --git a/scaletest/templates/scaletest-runner/scripts/prepare.sh b/scaletest/templates/scaletest-runner/scripts/prepare.sh
@@ -3,10 +3,13 @@ set -euo pipefail
 
 [[ $VERBOSE == 1 ]] && set -x
 
-echo "Preparing scaletest workspace environment..."
-touch /tmp/.scaletest_preparing
+# shellcheck disable=SC2153 source=scaletest/templates/scaletest-runner/scripts/lib.sh
+. "${SCRIPTS_DIR}/lib.sh"
+
+mkdir -p "${SCALETEST_STATE_DIR}"
 
-mkdir -p "${SCALETEST_RUN_DIR}"
+echo "Preparing scaletest workspace environment..."
+set_status Preparing
 
 echo "Installing prerequisites (terraform, envsubst, gcloud, jq and kubectl)..."
 

diff --git a/scaletest/templates/scaletest-runner/scripts/run.sh b/scaletest/templates/scaletest-runner/scripts/run.sh
@@ -7,7 +7,7 @@ set -euo pipefail
 . "${SCRIPTS_DIR}/lib.sh"
 
 log "Running scaletest..."
-touch /tmp/.scaletest_running
+set_status Running
 
 start_phase "Creating workspaces"
 coder exp scaletest create-workspaces \
@@ -56,4 +56,4 @@ end_phase
 wait_baseline 5
 
 log "Scaletest complete!"
-touch /tmp/.scaletest_complete
+set_status Complete
diff --git a/scaletest/templates/scaletest-runner/startup.sh b/scaletest/templates/scaletest-runner/startup.sh
@@ -15,13 +15,11 @@ rm /tmp/scripts.zip
 # shellcheck disable=SC2153 source=scaletest/templates/scaletest-runner/scripts/lib.sh
 . "${SCRIPTS_DIR}/lib.sh"
 
-# Clean up any previous scaletest runs (in case /tmp persists).
-rm -rf /tmp/.scaletest_* || true
-
 # Show failure in the UI if script exits with error.
 failed() {
-	echo "Scaletest failed!"
-	touch /tmp/.scaletest_failed
+	log "Scaletest failed!"
+	set_status Failed
+	lock_status # Ensure we never rewrite the status after a failure.
 }
 trap failed ERR