From 2fe8be679896683c86b71163978872820f9d64e5 Mon Sep 17 00:00:00 2001 From: ludamad Date: Thu, 5 Dec 2024 14:41:40 -0500 Subject: [PATCH 1/3] chore(network_test.sh): work around 143 by disabling stern --- yarn-project/end-to-end/scripts/network_test.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yarn-project/end-to-end/scripts/network_test.sh b/yarn-project/end-to-end/scripts/network_test.sh index bcbda75d050..37696e849f4 100755 --- a/yarn-project/end-to-end/scripts/network_test.sh +++ b/yarn-project/end-to-end/scripts/network_test.sh @@ -55,8 +55,10 @@ fi STERN_PID="" function copy_stern_to_log() { - ulimit -n 4096 - stern spartan -n $NAMESPACE > $SCRIPT_DIR/network-test.log & + # TODO(AD) we need to figure out a less resource intensive solution than stern + # ulimit -n 4096 + # stern spartan -n $NAMESPACE > $SCRIPT_DIR/network-test.log & + echo "disabled until less resource intensive solution than stern implemented" > $SCRIPT_DIR/network-test.log & STERN_PID=$! } From 96cf17a6c090bc390d5a51e620c3f7165dbd1a3e Mon Sep 17 00:00:00 2001 From: ludamad Date: Thu, 5 Dec 2024 15:40:24 -0500 Subject: [PATCH 2/3] Update network_test.sh --- yarn-project/end-to-end/scripts/network_test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn-project/end-to-end/scripts/network_test.sh b/yarn-project/end-to-end/scripts/network_test.sh index 37696e849f4..b9083df3d7e 100755 --- a/yarn-project/end-to-end/scripts/network_test.sh +++ b/yarn-project/end-to-end/scripts/network_test.sh @@ -53,13 +53,13 @@ if [ "$FRESH_INSTALL" = "true" ]; then kubectl delete namespace "$NAMESPACE" --ignore-not-found=true --wait=true --now --timeout=10m fi -STERN_PID="" +# STERN_PID="" function copy_stern_to_log() { # TODO(AD) we need to figure out a less resource intensive solution than stern # ulimit -n 4096 # stern spartan -n $NAMESPACE > $SCRIPT_DIR/network-test.log & echo "disabled until less resource intensive solution than stern implemented" > $SCRIPT_DIR/network-test.log & - STERN_PID=$! + # STERN_PID=$! } function show_status_until_pxe_ready() { @@ -115,7 +115,7 @@ show_status_until_pxe_ready & function cleanup() { # kill everything in our process group except our process - trap - SIGTERM && kill -9 $(pgrep -g $$ | grep -v $$) $(jobs -p) $STERN_PID &>/dev/null || true + trap - SIGTERM && kill -9 $(pgrep -g $$ | grep -v $$) $(jobs -p) &>/dev/null || true if [ "$CLEANUP_CLUSTER" = "true" ]; then kind delete cluster || true From 5db2900c405d7109bc1b778a8ef7500219788261 Mon Sep 17 00:00:00 2001 From: Mitch Date: Fri, 6 Dec 2024 08:01:41 -0500 Subject: [PATCH 3/3] fix: tolerate more missed slots --- yarn-project/end-to-end/src/spartan/gating-passive.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn-project/end-to-end/src/spartan/gating-passive.test.ts b/yarn-project/end-to-end/src/spartan/gating-passive.test.ts index 2285dac373d..6d8b52261aa 100644 --- a/yarn-project/end-to-end/src/spartan/gating-passive.test.ts +++ b/yarn-project/end-to-end/src/spartan/gating-passive.test.ts @@ -48,8 +48,8 @@ describe('a test that passively observes the network in the presence of network const ETHEREUM_HOST = `http://127.0.0.1:${HOST_ETHEREUM_PORT}`; const PXE_URL = `http://127.0.0.1:${HOST_PXE_PORT}`; - // 50% is the max that we expect to miss - const MAX_MISSED_SLOT_PERCENT = 0.5; + // 60% is the max that we expect to miss + const MAX_MISSED_SLOT_PERCENT = 0.6; afterAll(async () => { await runAlertCheck(config, qosAlerts, debugLogger);