Fix flaky QUIC hole-punching tests (#314)

libp2p · Oct 25, 2023 · 9247c9f · 9247c9f
1 parent 261c197
commit 9247c9f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/hole-punch-interop.yml b/.github/workflows/hole-punch-interop.yml
@@ -11,9 +11,19 @@ on:
 
 name: libp2p holepunching interop test
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   run-hole-punch-interop:
     runs-on: ['self-hosted', 'linux', 'x64', '4xlarge'] # https://github.com/pl-strflt/tf-aws-gh-runner/blob/main/runners.tf
+# Uncomment to test for flakiness.
+#    strategy:
+#      matrix:
+#        dim1: ['a', 'b', 'c', 'd', 'e']
+#        dim2: [1, 2, 3, 4, 5]
+#      fail-fast: false
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/run-interop-hole-punch-test

diff --git a/hole-punch-interop/impl/rust/v0.52/Makefile b/hole-punch-interop/impl/rust/v0.52/Makefile
@@ -1,5 +1,5 @@
 image_name := rust-v0.52
-commitSha := d99fa2f87406cbd1a207b29f8cbcec32b7b180f7
+commitSha := 1ead41ed04ce89e50b11a078586e47d89e17d3c4
 
 all: image.json
 

diff --git a/hole-punch-interop/rust-relay/src/main.rs b/hole-punch-interop/rust-relay/src/main.rs
@@ -23,9 +23,8 @@ const RELAY_QUIC_ADDRESS: &str = "RELAY_QUIC_ADDRESS";
 #[tokio::main]
 async fn main() -> Result<()> {
     env_logger::builder()
-        .filter_level(log::LevelFilter::Debug)
         .parse_filters(
-            "netlink_proto=warn,rustls=warn,multistream_select=warn,libp2p_swarm::connection=info",
+            "debug,netlink_proto=warn,rustls=warn,multistream_select=warn,libp2p_swarm::connection=info,quinn=debug,libp2p_quic=trace",
         )
         .parse_default_env()
         .init();

diff --git a/hole-punch-interop/src/generator.ts b/hole-punch-interop/src/generator.ts
@@ -54,7 +54,7 @@ function buildSpec(name: string, dialerImage: string, listenerImage: string, rou
         set -ex;
 
         ROUTER_IP=$$(dig +short ${actor}_router)
-        INTERNET_SUBNET=$$(curl --silent --unix-socket /var/run/docker.sock http://localhost/networks/${internetNetworkName} | jq -r '.IPAM.Config[0].Subnet')
+        INTERNET_SUBNET=$$(curl --fail --silent --unix-socket /var/run/docker.sock http://localhost/networks/${internetNetworkName} | jq -r '.IPAM.Config[0].Subnet')
 
         ip route add $$INTERNET_SUBNET via $$ROUTER_IP dev eth0
 
@@ -138,6 +138,7 @@ function buildSpec(name: string, dialerImage: string, listenerImage: string, rou
                 environment: {
                     TRANSPORT: transport,
                     MODE: "listen",
+                    SSLKEYLOGFILE: "/tmp/tls.key"
                 },
                 networks: {
                     lan_listener: {},