feat(cluster): use supervisorctl_local script for node management

.github/node_upgrade_pytest.sh

@@ -190,22 +190,22 @@ elif [ "$1" = "step2" ]; then
 
   # Restart local cluster nodes with binaries from new cluster-node version.
   # It is necessary to restart supervisord with new environment.
-  "$STATE_CLUSTER/supervisorctl" stop all
+  "$STATE_CLUSTER/supervisorctl_local" stop all
   sleep 5
   "$STATE_CLUSTER/stop-cluster"
   sleep 3
   "$STATE_CLUSTER/supervisord_start" || exit 6
   sleep 5
-  "$STATE_CLUSTER/supervisorctl" start all
+  "$STATE_CLUSTER/supervisorctl_local" start all
   sleep 5
-  "$STATE_CLUSTER/supervisorctl" status
+  "$STATE_CLUSTER/supervisorctl_local" status
 
   # print path to cardano-node binaries
   echo "pool1 node binary:"
-  pool1_pid="$("$STATE_CLUSTER/supervisorctl" pid nodes:pool1)"
+  pool1_pid="$("$STATE_CLUSTER/supervisorctl_local" pid nodes:pool1)"
   readlink -m "/proc/$pool1_pid/exe"
   echo "pool3 node binary:"
-  pool3_pid="$("$STATE_CLUSTER/supervisorctl" pid nodes:pool3)"
+  pool3_pid="$("$STATE_CLUSTER/supervisorctl_local" pid nodes:pool3)"
   readlink -m "/proc/$pool3_pid/exe"
 
   # check that nodes are running
@@ -313,16 +313,16 @@ elif [ "$1" = "step3" ]; then
   cp -f "$STATE_CLUSTER/cardano-node-pool3.orig" "$STATE_CLUSTER/cardano-node-pool3"
 
   # restart all nodes
-  "$STATE_CLUSTER/supervisorctl" restart nodes:
+  "$STATE_CLUSTER/supervisorctl_local" restart nodes:
   sleep 10
-  "$STATE_CLUSTER/supervisorctl" status
+  "$STATE_CLUSTER/supervisorctl_local" status
 
   # print path to cardano-node binaries
   echo "pool1 node binary:"
-  pool1_pid="$("$STATE_CLUSTER/supervisorctl" pid nodes:pool1)"
+  pool1_pid="$("$STATE_CLUSTER/supervisorctl_local" pid nodes:pool1)"
   readlink -m "/proc/$pool1_pid/exe"
   echo "pool3 node binary:"
-  pool3_pid="$("$STATE_CLUSTER/supervisorctl" pid nodes:pool3)"
+  pool3_pid="$("$STATE_CLUSTER/supervisorctl_local" pid nodes:pool3)"
   readlink -m "/proc/$pool3_pid/exe"
 
   # check that nodes are running

cardano_node_tests/cluster_scripts/testnets/start-cluster

@@ -136,7 +136,7 @@ fi
 
 # create scripts for cluster starting / stopping
 printf "#!/bin/sh\n\nsupervisorctl -s unix:///%s start all" "$SUPERVISORD_SOCKET_PATH" > "${STATE_CLUSTER}/supervisorctl_start"
-printf "#!/bin/sh\n\nsupervisorctl -s unix:///%s \"\$@\"" "$SUPERVISORD_SOCKET_PATH" > "${STATE_CLUSTER}/supervisorctl"
+printf "#!/bin/sh\n\nsupervisorctl -s unix:///%s \"\$@\"" "$SUPERVISORD_SOCKET_PATH" > "${STATE_CLUSTER}/supervisorctl_local"
 
 cat > "$STATE_CLUSTER/supervisord_start" <<EoF
 #!/usr/bin/env bash

cardano_node_tests/utils/cluster_nodes.py

@@ -366,7 +366,7 @@ def run_supervisorctl(
         socket_path = pl.Path(os.environ["CARDANO_NODE_SOCKET_PATH"])
         state_cluster_dirname = f"{STATE_CLUSTER}{instance_num}"
         state_dir = socket_path.parent.parent / state_cluster_dirname
-    script = state_dir / "supervisorctl"
+    script = state_dir / "supervisorctl_local"
     return helpers.run_command([str(script), *args], ignore_fail=ignore_fail)
 
 

pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
 dependencies = [
     "allure-pytest (>=2.15.2,<3.0.0)",
     "cardano-clusterlib (>=0.10.0,<0.11.0)",
-    "cardonnay (>=0.3.0,<0.4.0)",
+    "cardonnay (>=0.3.1,<0.4.0)",
     "cbor2 (>=5.7.1,<6.0.0)",
     "filelock (>=3.20.0,<4.0.0)",
     "hypothesis (>=6.148.7,<7.0.0)",

scripts/restart_dev_cluster.sh

@@ -30,9 +30,9 @@ sleep 2
 "$STATE_CLUSTER/supervisord_start"
 sleep 2
 
-"$STATE_CLUSTER/supervisorctl" start all
+"$STATE_CLUSTER/supervisorctl_local" start all
 sleep 1
 
 echo
 echo "Dev cluster restarted; current status:"
-"$STATE_CLUSTER/supervisorctl" status all
+"$STATE_CLUSTER/supervisorctl_local" status all