From fe27f9c28a72ef9a75427f4a199c4236f6791f2d Mon Sep 17 00:00:00 2001 From: "denis.bilenko" Date: Wed, 11 Nov 2026 22:47:06 +0000 Subject: [PATCH] acc: also suppress bare "retrying" warnings retry.With logs a bare "retrying" when the error is not an API error, e.g. an unexpected EOF on GET /clusters/get retried by IsTransientRead. The default SuppressLines.warn_retry pattern only matched "retrying after ", so these timing-dependent warnings leaked into compared output of cluster tests on cloud. Co-authored-by: Isaac --- acceptance/selftest/suppresslines/keep/output.txt | 1 + acceptance/selftest/suppresslines/keep/script | 1 + acceptance/selftest/suppresslines/script | 1 + acceptance/test.toml | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/acceptance/selftest/suppresslines/keep/output.txt b/acceptance/selftest/suppresslines/keep/output.txt index f0f63e21e56..a90b6472bc2 100644 --- a/acceptance/selftest/suppresslines/keep/output.txt +++ b/acceptance/selftest/suppresslines/keep/output.txt @@ -2,3 +2,4 @@ Signal: before Noise: 1 Signal: after Warn: deploying resources.jobs.foo: retrying after 500 Internal Server Error from GET /api +Warn: deploying resources.clusters.foo: retrying diff --git a/acceptance/selftest/suppresslines/keep/script b/acceptance/selftest/suppresslines/keep/script index bcc5b790f43..e7e634a17ad 100644 --- a/acceptance/selftest/suppresslines/keep/script +++ b/acceptance/selftest/suppresslines/keep/script @@ -2,3 +2,4 @@ echo "Signal: before" echo "Noise: 1" echo "Signal: after" echo "Warn: deploying resources.jobs.foo: retrying after 500 Internal Server Error from GET /api" +echo "Warn: deploying resources.clusters.foo: retrying" diff --git a/acceptance/selftest/suppresslines/script b/acceptance/selftest/suppresslines/script index bcc5b790f43..e7e634a17ad 100644 --- a/acceptance/selftest/suppresslines/script +++ b/acceptance/selftest/suppresslines/script @@ -2,3 +2,4 @@ echo "Signal: before" echo "Noise: 1" echo "Signal: after" echo "Warn: deploying resources.jobs.foo: retrying after 500 Internal Server Error from GET /api" +echo "Warn: deploying resources.clusters.foo: retrying" diff --git a/acceptance/test.toml b/acceptance/test.toml index 6e18a40e78a..390812795a6 100644 --- a/acceptance/test.toml +++ b/acceptance/test.toml @@ -28,7 +28,8 @@ SortLines.deploy_actions = '^(Created|Updated|Deleted|Recreated|Resized) \S+$' # Retries are timing dependent, so their warnings would make output flaky. They go to the # test log instead. A test that injects errors deterministically and asserts the warning # sets SuppressLines.warn_retry = "". -SuppressLines.warn_retry = '^Warn: .*retrying after ' +# Errors without an HTTP status (e.g. unexpected EOF on a read) produce a bare "retrying". +SuppressLines.warn_retry = '^Warn: (.*: )?retrying( after |$)' # >>> datetime.datetime.fromtimestamp(18000000000) # datetime.datetime(2027, 1, 15, 9, 0)