workbench: fixes for supervisor, mac compatible pgrep

Author: fmaste

nix/workbench/backend/nomad/cloud.sh

@@ -729,7 +729,8 @@ deploy-genesis-nomadcloud() {
     then
       wb_nomad agents stop "${server_name}" "${client_name}" "exec"
     fi
-    backend_nomad stop-nomad-job "${dir}"
+    # Already "fatal" -> ignore errors!
+    backend_nomad stop-nomad-job "${dir}" || true
     fatal "Failed to upload genesis"
   fi
 
@@ -738,6 +739,9 @@ deploy-genesis-nomadcloud() {
   if ! backend_nomad deploy-genesis-wget "${dir}" "${uri}"
   then
     # File kept for debugging!
+    msg "$(red "FATAL: deploy-genesis-wget \"${dir}\" \"${uri}\"")"
+    # Already "fatal" -> ignore errors!
+    backend_nomad stop-nomad-job "${dir}" || true
     fatal "Deploy of genesis \"${uri}\" failed"
   else
     msg "$(green "Genesis \"${uri}\" deployed successfully")"
@@ -746,12 +750,13 @@ deploy-genesis-nomadcloud() {
     aws s3 rm                                         \
       s3://"${s3_bucket_name}"/"${genesis_file_name}" \
       --region "${s3_region}"                         \
-    || true
+    || true # Ignore errors when doing clean ups!
     # Reminder to remove old files.
     msg "Still available files at $(yellow "\"s3://${s3_bucket_name}\""):"
     aws s3 ls                   \
       s3://"${s3_bucket_name}"/ \
-      --region "${s3_region}"
+      --region "${s3_region}"   \
+    || true # Ignore errors when doing clean ups!
   fi
 }
 

nix/workbench/backend/supervisor.sh

@@ -25,8 +25,10 @@ case "$op" in
                 grep ':9001 '             |
                 wc -l)" = "0" ||
             echo 'supervisord'
+        # `pgrep` piped to `wc -l` instead "--count" to make it Mac comptible
+        # Also only shorthand options: like `-x` instead of `--exact`
         for exe in 'cardano-node' 'tx-generator' 'cardano-tracer'
-        do test $(pgrep --exact --count $exe)   = 0 || echo $exe
+        do test $(pgrep -x $exe | wc -l)   = 0 || echo $exe
         done
         ;;
 
@@ -176,7 +178,7 @@ EOF
 
         # Avoid buffer related problems with stdout and stderr disabling buffering
         # https://docs.python.org/3/using/cmdline.html#envvar-PYTHONUNBUFFERED
-        if ! PYTHONUNBUFFERED=TRUE supervisord --config  "$dir"/supervisor/supervisord.conf $@
+        if ! PYTHONUNBUFFERED=TRUE supervisord --config "$dir"/supervisor/supervisord.conf $@ >"$dir"/supervisor/stderr 2>"$dir"/supervisor/stderr
         then progress "supervisor" "$(red fatal: failed to start) $(white supervisord)"
              echo "$(red supervisord.conf) --------------------------------" >&2
              cat "$dir"/supervisor/supervisord.conf
@@ -325,6 +327,8 @@ EOF
         local usage="USAGE: wb backend $op RUN-DIR"
         local dir=${1:?$usage}; shift
 
+        # This flag/file makes `scenario_watcher` exit
+        touch ${dir}/flag/cluster-stopping
         if test -f ${dir}/supervisor/supervisord.pid -a \
                 -f ${dir}/supervisor/child.pids
         then kill $(<${dir}/supervisor/supervisord.pid) $(<${dir}/supervisor/child.pids) 2>/dev/null
@@ -386,3 +390,22 @@ EOF
 
     * ) usage_supervisor;; esac
 }
+
+###############################################################################
+# Debugging ###################################################################
+###############################################################################
+
+if test -n "${SUPERVISOR_DEBUG:-}"
+then
+  exec 5> "$(dirname "$(readlink -f "$0")")"/supervisor.sh.debug
+  BASH_XTRACEFD="5"
+  PS4='$LINENO: '
+  set -x
+fi
+
+debugMsg() {
+  if test -n "${SUPERVISOR_DEBUG:-}"
+  then
+    >&2 echo -e "\n\n\t\t----------$1\n"
+  fi
+}

nix/workbench/nomad.sh

@@ -657,7 +657,9 @@ EOL
           local usage="USAGE: wb nomad ${op} ${subop} SERVER-NAME"
           local name=${1:?$usage}; shift
           local config_file=$(wb_nomad server config-file-path "${name}")
-          pgrep --delimiter ' ' --full "nomad.*${config_file}.*"
+          # Make it Mac compatible by only using shorthand options:
+          # `-d` instead of `--delimiter` and `-f` instead of `--full`
+          pgrep -d ' ' -f "nomad.*${config_file}.*"
           # Clean up is only done by the `stop` subcommand!
           # No `rm "${pid_file}"` if not running.
         ;;
@@ -668,7 +670,9 @@ EOL
           local pid_file=$(wb_nomad server pid-filepath "${name}")
           local config_file=$(wb_nomad server config-file-path "${name}")
           # It's running if we haven't PROPERLY stopped it or PIDs exist!
-          test -f "${pid_file}" || test $(pgrep --count --full "nomad.*${config_file}.*") -gt 0
+          # `pgrep` piped to `wc -l` instead "--count" to make it Mac comptible
+          # Also only shorthand options: like `-f` instead of `--full`
+          test -f "${pid_file}" || test $(pgrep -f "nomad.*${config_file}.*" | wc -l) -gt 0
         ;;
 ####### server -> start )#######################################################
         start )
@@ -879,7 +883,9 @@ EOL
           local usage="USAGE: wb nomad ${op} ${subop} CLIENT-NAME"
           local name=${1:?$usage}; shift
           local config_file=$(wb_nomad client config-file-path "${name}")
-          pgrep --delimiter ' ' --full "nomad.*${config_file}.*"
+          # Make it Mac compatible by only using shorthand options:
+          # `-d` instead of `--delimiter` and `-f` instead of `--full`
+          pgrep -d ' ' -f "nomad.*${config_file}.*"
           # Clean up is only done by the `stop` subcommand!
           # No `rm "${pid_file}"` if not running.
         ;;
@@ -890,7 +896,9 @@ EOL
           local pid_file=$(wb_nomad client pid-filepath "${name}")
           local config_file=$(wb_nomad client config-file-path "${name}")
           # It's running if we haven't PROPERLY stopped it or PIDs exist!
-          test -f "${pid_file}" || test $(pgrep --count --full "nomad.*${config_file}.*") -gt 0
+          # `pgrep` piped to `wc -l` instead "--count" to make it Mac comptible
+          # Also only shorthand options: like `-f` instead of `--full`
+          test -f "${pid_file}" || test $(pgrep -f "nomad.*${config_file}.*" | wc -l) -gt 0
         ;;
 ####### client -> start )#######################################################
         # Agent is started with `-network-interface lo` if not without a proper
@@ -1317,7 +1325,9 @@ EOF
         pids-array )
           local usage="USAGE: wb nomad ${op} ${subop}"
           local state_dir=$(wb_nomad webfs state-dir-path)
-          pgrep --delimiter ' ' --full "webfsd.*${state_dir}"/webfsd.log
+          # Make it Mac compatible by only using shorthand options:
+          # `-d` instead of `--delimiter` and `-f` instead of `--full`
+          pgrep -d ' ' -f "webfsd.*${state_dir}"/webfsd.log
           # Clean up is only done by the `stop` subcommand!
           # No `rm "${pid_file}"` if not running.
         ;;
@@ -1326,7 +1336,9 @@ EOF
           local pid_file=$(wb_nomad webfs pid-filepath)
           local state_dir=$(wb_nomad webfs state-dir-path)
           # It's running if we haven't PROPERLY stopped it or PIDs exist!
-          test -f "${pid_file}" && test $(pgrep --count --full "webfsd.*${state_dir}"/webfsd.log) -gt 0
+          # `pgrep` piped to `wc -l` instead "--count" to make it Mac comptible
+          # Also only shorthand options: like `-f` instead of `--full`
+          test -f "${pid_file}" && test $(pgrep -f "webfsd.*${state_dir}"/webfsd.log | wc -l) -gt 0
         ;;
         start )
           local usage="USAGE: wb nomad ${op} ${subop}"