From e241613279daee41d061412d256afc078ca831fb Mon Sep 17 00:00:00 2001 From: Diva M Date: Tue, 13 Aug 2024 15:28:54 -0500 Subject: [PATCH 1/8] make good news --- .github/workflows/flaky.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/flaky.yaml b/.github/workflows/flaky.yaml index 93836b9a8d..0487b269f4 100644 --- a/.github/workflows/flaky.yaml +++ b/.github/workflows/flaky.yaml @@ -73,6 +73,8 @@ jobs: # https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings EOF=aP51VriWCxNJ1JjvmO9i echo "summary<<$EOF" >> $GITHUB_OUTPUT + echo "Flaky tests failure:" >> $GITHUB_OUTPUT + echo " " >> $GITHUB_OUTPUT for report in nextest-results/*.json; do # remove the name prefix and extension, and split the parts name=$(echo ${report:16:-5} | tr _ ' ') @@ -84,16 +86,13 @@ jobs: echo "$failure" echo "$failure" >> $GITHUB_OUTPUT done + echo "" >> $GITHUB_OUTPUT + echo "See https://github.com/n0-computer/iroh/actions/workflows/flaky.yaml" >> $GITHUB_OUTPUT echo "$EOF" >> $GITHUB_OUTPUT - name: Notify discord on failure uses: n0-computer/discord-webhook-notify@v1 if: ${{ env.TESTS_RESULT == 'failure' }} with: - severity: warn - details: | - Flaky tests failure: - - ${{ steps.make_summary.outputs.summary }} - - See https://github.com/n0-computer/iroh/actions/workflows/flaky.yaml + severity: ${{ env.TESTS_RESULT == 'failure' && 'warn' || 'info' }} + details: ${{ env.TESTS_RESULT == 'failure' && steps.make_summary.outputs.summary || 'No flaky failure!' }} webhookUrl: ${{ secrets.DISCORD_N0_GITHUB_CHANNEL_WEBHOOK_URL }} From 97a69b1081113dca5d7c9ca044be33c1a76eefd2 Mon Sep 17 00:00:00 2001 From: Diva M Date: Tue, 13 Aug 2024 16:14:28 -0500 Subject: [PATCH 2/8] remove conditional --- .github/workflows/flaky.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/flaky.yaml b/.github/workflows/flaky.yaml index 0487b269f4..4f064cd32f 100644 --- a/.github/workflows/flaky.yaml +++ b/.github/workflows/flaky.yaml @@ -91,7 +91,6 @@ jobs: echo "$EOF" >> $GITHUB_OUTPUT - name: Notify discord on failure uses: n0-computer/discord-webhook-notify@v1 - if: ${{ env.TESTS_RESULT == 'failure' }} with: severity: ${{ env.TESTS_RESULT == 'failure' && 'warn' || 'info' }} details: ${{ env.TESTS_RESULT == 'failure' && steps.make_summary.outputs.summary || 'No flaky failure!' }} From 0cdd6cb3ea0e7aba7e046000510617f57b0546e4 Mon Sep 17 00:00:00 2001 From: Diva M Date: Tue, 13 Aug 2024 16:24:07 -0500 Subject: [PATCH 3/8] skip cancelled jobs --- .github/workflows/flaky.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/flaky.yaml b/.github/workflows/flaky.yaml index 4f064cd32f..c985577529 100644 --- a/.github/workflows/flaky.yaml +++ b/.github/workflows/flaky.yaml @@ -91,6 +91,7 @@ jobs: echo "$EOF" >> $GITHUB_OUTPUT - name: Notify discord on failure uses: n0-computer/discord-webhook-notify@v1 + if: ${{ env.TESTS_RESULT =! 'cancelled' }} with: severity: ${{ env.TESTS_RESULT == 'failure' && 'warn' || 'info' }} details: ${{ env.TESTS_RESULT == 'failure' && steps.make_summary.outputs.summary || 'No flaky failure!' }} From e0cb2666153e4c4ca94b4ade1d16881ebd311690 Mon Sep 17 00:00:00 2001 From: Diva M Date: Tue, 13 Aug 2024 16:28:47 -0500 Subject: [PATCH 4/8] skip cancelled jobs done well --- .github/workflows/flaky.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flaky.yaml b/.github/workflows/flaky.yaml index c985577529..fed1d260c3 100644 --- a/.github/workflows/flaky.yaml +++ b/.github/workflows/flaky.yaml @@ -91,7 +91,7 @@ jobs: echo "$EOF" >> $GITHUB_OUTPUT - name: Notify discord on failure uses: n0-computer/discord-webhook-notify@v1 - if: ${{ env.TESTS_RESULT =! 'cancelled' }} + if: ${{ env.TESTS_RESULT != 'cancelled' }} with: severity: ${{ env.TESTS_RESULT == 'failure' && 'warn' || 'info' }} details: ${{ env.TESTS_RESULT == 'failure' && steps.make_summary.outputs.summary || 'No flaky failure!' }} From d3533cc3f8210d5085da5ef975d9d68c0c41fcef Mon Sep 17 00:00:00 2001 From: Diva M Date: Tue, 13 Aug 2024 16:42:50 -0500 Subject: [PATCH 5/8] damn s --- .github/workflows/flaky.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/flaky.yaml b/.github/workflows/flaky.yaml index fed1d260c3..0e5bae7569 100644 --- a/.github/workflows/flaky.yaml +++ b/.github/workflows/flaky.yaml @@ -94,5 +94,5 @@ jobs: if: ${{ env.TESTS_RESULT != 'cancelled' }} with: severity: ${{ env.TESTS_RESULT == 'failure' && 'warn' || 'info' }} - details: ${{ env.TESTS_RESULT == 'failure' && steps.make_summary.outputs.summary || 'No flaky failure!' }} + details: ${{ env.TESTS_RESULT == 'failure' && steps.make_summary.outputs.summary || 'No flaky failures!' }} webhookUrl: ${{ secrets.DISCORD_N0_GITHUB_CHANNEL_WEBHOOK_URL }} From e0d7dd79feb805c97eccfc04d1e8d44609abef24 Mon Sep 17 00:00:00 2001 From: Diva M Date: Tue, 13 Aug 2024 16:47:04 -0500 Subject: [PATCH 6/8] increase timeout --- iroh-net/src/discovery/local_swarm_discovery.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iroh-net/src/discovery/local_swarm_discovery.rs b/iroh-net/src/discovery/local_swarm_discovery.rs index 4c83b44cd2..7cd3ad1125 100644 --- a/iroh-net/src/discovery/local_swarm_discovery.rs +++ b/iroh-net/src/discovery/local_swarm_discovery.rs @@ -299,10 +299,10 @@ mod tests { tracing::debug!(?node_id_b, "Discovering node id b"); // publish discovery_b's address discovery_b.publish(&addr_info); - let s1_res = tokio::time::timeout(Duration::from_secs(5), s1.next()) + let s1_res = tokio::time::timeout(Duration::from_secs(10), s1.next()) .await? .unwrap()?; - let s2_res = tokio::time::timeout(Duration::from_secs(5), s2.next()) + let s2_res = tokio::time::timeout(Duration::from_secs(10), s2.next()) .await? .unwrap()?; assert_eq!(s1_res.addr_info, addr_info); From 7009feaacb969b07c385116fb1c01bc42a49fead Mon Sep 17 00:00:00 2001 From: Diva M Date: Tue, 13 Aug 2024 17:06:32 -0500 Subject: [PATCH 7/8] restore timeouts --- .config/nextest.toml | 6 +++--- iroh-net/src/discovery/local_swarm_discovery.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.config/nextest.toml b/.config/nextest.toml index fc3ed95a21..4f0a061fb0 100644 --- a/.config/nextest.toml +++ b/.config/nextest.toml @@ -1,10 +1,10 @@ [test-groups] -run-in-isolation = { max-threads = 16 } +run-in-isolation = { max-threads = 32 } # these are tests that must not run with other tests concurrently. All tests in -# this group can take up at most 16 threads among them, but each one requiring +# this group can take up at most 32 threads among them, but each one requiring # 16 threads also. The effect should be that tests run isolated. [[profile.ci.overrides]] filter = 'test(::run_in_isolation::)' test-group = 'run-in-isolation' -threads-required = 16 +threads-required = 32 diff --git a/iroh-net/src/discovery/local_swarm_discovery.rs b/iroh-net/src/discovery/local_swarm_discovery.rs index 7cd3ad1125..4c83b44cd2 100644 --- a/iroh-net/src/discovery/local_swarm_discovery.rs +++ b/iroh-net/src/discovery/local_swarm_discovery.rs @@ -299,10 +299,10 @@ mod tests { tracing::debug!(?node_id_b, "Discovering node id b"); // publish discovery_b's address discovery_b.publish(&addr_info); - let s1_res = tokio::time::timeout(Duration::from_secs(10), s1.next()) + let s1_res = tokio::time::timeout(Duration::from_secs(5), s1.next()) .await? .unwrap()?; - let s2_res = tokio::time::timeout(Duration::from_secs(10), s2.next()) + let s2_res = tokio::time::timeout(Duration::from_secs(5), s2.next()) .await? .unwrap()?; assert_eq!(s1_res.addr_info, addr_info); From 9df861f8fd9b7f95cfad19e0a8e4b23d7fc9833f Mon Sep 17 00:00:00 2001 From: Diva M Date: Tue, 13 Aug 2024 21:23:47 -0500 Subject: [PATCH 8/8] Re-trigger ci