CI: move the memory monitor into a script, and add an ASAN constant

The memory logging loop was duplicated in the valgrind and sanitizer
jobs. Move it to .github/scripts/mem-monitor.sh so each job starts it
with one line.

Add ASAN to pyln.testing.utils next to VALGRIND, and use it in
test_connection.py in place of reading the variable directly.

Changelog-None
Signed-off-by: daywalker90 <daywalker990@gmx.de>

Author: daywalker90

.github/scripts/mem-monitor.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+# Log memory to the job log every 15s during a test run, so readings made
+# before a VM kill survive. Run in the background and kill it when done.
+while sleep 15; do
+  printf '\n[mem %s] %s\n' "$(date +%T)" "$(free -m | awk '/Mem:/{print "used="$3"MB avail="$7"MB"}')"
+  ps -eo rss=,comm= | awk '{s[$2]+=$1; c[$2]++} END{for(k in s) printf "%d %d %s\n", s[k]/1024, c[k], k}' | sort -rn | head -n 5 | awk '{printf "[mem]   %6d MB  x%-4d %s\n", $1, $2, $3}'
+done

.github/workflows/ci.yaml

@@ -707,11 +707,7 @@ jobs:
           TEST_DEBUG: 1
           PYTEST_OPTS: ${{ env.PYTEST_OPTS_BASE }} --test-group-random-seed=42
         run: |
-          # Memory is logged to the job log during the run, so readings before a VM kill survive.
-          (while sleep 15; do
-            printf '\n[mem %s] %s\n' "$(date +%T)" "$(free -m | awk '/Mem:/{print "used="$3"MB avail="$7"MB"}')"
-            ps -eo rss=,comm= | awk '{s[$2]+=$1; c[$2]++} END{for(k in s) printf "%d %d %s\n", s[k]/1024, c[k], k}' | sort -rn | head -n 5 | awk '{printf "[mem]   %6d MB  x%-4d %s\n", $1, $2, $3}'
-          done) &
+          .github/scripts/mem-monitor.sh &
           mem_pid=$!
           trap 'kill $mem_pid 2>/dev/null' EXIT
           # -n $(nproc) rather than $(nproc)+1: one fewer parallel node-cluster
@@ -780,11 +776,7 @@ jobs:
         env:
           PYTEST_OPTS: ${{ env.PYTEST_OPTS_BASE }} --test-group-random-seed=42
         run: |
-          # Memory is logged to the job log during the run, so readings before a VM kill survive.
-          (while sleep 15; do
-            printf '\n[mem %s] %s\n' "$(date +%T)" "$(free -m | awk '/Mem:/{print "used="$3"MB avail="$7"MB"}')"
-            ps -eo rss=,comm= | awk '{s[$2]+=$1; c[$2]++} END{for(k in s) printf "%d %d %s\n", s[k]/1024, c[k], k}' | sort -rn | head -n 5 | awk '{printf "[mem]   %6d MB  x%-4d %s\n", $1, $2, $3}'
-          done) &
+          .github/scripts/mem-monitor.sh &
           mem_pid=$!
           trap 'kill $mem_pid 2>/dev/null' EXIT
           # loadgroup: tests marked heavy run one at a time on a single worker.

contrib/pyln-testing/pyln/testing/utils.py

@@ -81,6 +81,7 @@ def env(name, default=None):
 
 
 VALGRIND = env("VALGRIND") == "1"
+ASAN = env("ASAN", "0") == "1"
 TEST_NETWORK = env("TEST_NETWORK", 'regtest')
 TEST_DEBUG = env("TEST_DEBUG", "0") == "1"
 

tests/test_connection.py

@@ -15,7 +15,7 @@
     mine_funding_to_announce, first_scid,
     CHANNEL_SIZE
 )
-from pyln.testing.utils import VALGRIND, EXPERIMENTAL_DUAL_FUND, FUNDAMOUNT, RUST, SLOW_MACHINE, env
+from pyln.testing.utils import VALGRIND, ASAN, EXPERIMENTAL_DUAL_FUND, FUNDAMOUNT, RUST, SLOW_MACHINE
 
 import coincurve
 import hashlib
@@ -1491,7 +1491,7 @@ def test_funding_cancel_race(node_factory, bitcoind, executor):
 
     if VALGRIND:
         num = 5
-    elif env('ASAN') == '1':
+    elif ASAN:
         num = 10
     elif SLOW_MACHINE:
         num = 20
@@ -5530,7 +5530,7 @@ def test_parallel_opens(node_factory, bitcoind, executor):
     """On macOS a socket closed by its sender while in flight over SCM_RIGHTS
     could arrive unable to read, losing a subdaemon its hsmd or peer
     connection under load (#5808)."""
-    if env('ASAN') == '1':
+    if ASAN:
         pairs, opens = 2, 10
     else:
         pairs, opens = 6, 50