From 0da9f60c5d1f2d34e60368a9533e12877e0e6fb4 Mon Sep 17 00:00:00 2001 From: "maggie.wang" Date: Fri, 30 Oct 2026 18:35:22 +0000 Subject: [PATCH 1/2] air: don't announce retries before a run fails `air run --watch` printed "Failed attempts will be retried up to 3 times." on every run, because max_retries defaults to 3. On a healthy run this reads as if something already failed. The log stream already prints "Retrying (n of m)..." when a retry actually happens. Tracking: CNXT-2481. Co-authored-by: Isaac --- cmd/air/run.go | 7 ------- cmd/air/run_watch_test.go | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/cmd/air/run.go b/cmd/air/run.go index db65967a32a..d63193e5888 100644 --- a/cmd/air/run.go +++ b/cmd/air/run.go @@ -243,13 +243,6 @@ The path must be a separate argument: cobra reserves -h as a boolean, so // Separate the submit summary from the streamed logs. fmt.Fprintln(out) fmt.Fprintln(out, monitoringMessage) - if maxRetries > 0 { - unit := "times" - if maxRetries == 1 { - unit = "time" - } - fmt.Fprintf(out, "Failed attempts will be retried up to %d %s.\n", maxRetries, unit) - } printLogsDivider(ctx, out) return handleWatchResult(out, w.Config.Profile, runIDStr, runLogs(watchCtx, cmd, req)) } diff --git a/cmd/air/run_watch_test.go b/cmd/air/run_watch_test.go index e1843e78ed1..52a859de21b 100644 --- a/cmd/air/run_watch_test.go +++ b/cmd/air/run_watch_test.go @@ -129,7 +129,8 @@ func TestRunWatchStreamsLogs(t *testing.T) { assert.Contains(t, out, "Submitted workload with Job Run ID: 777") assert.Contains(t, out, "View job run at: ") assert.Contains(t, out, "Monitoring run and streaming logs...") - assert.Contains(t, out, "Failed attempts will be retried up to 3 times.") + // Retries are announced only when one happens, so a healthy run doesn't look like it failed. + assert.NotContains(t, out, "retried") assert.NotContains(t, out, "from node 0") // A "Logs" divider separates the submit summary from the streamed logs. assert.Contains(t, out, "Logs") From eebc79e7bee1dae08fa115b7a317be03be726edf Mon Sep 17 00:00:00 2001 From: "maggie.wang" Date: Fri, 30 Oct 2026 18:40:23 +0000 Subject: [PATCH 2/2] Add changelog entry Co-authored-by: Isaac --- .nextchanges/air/watch-retry-notice.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 .nextchanges/air/watch-retry-notice.md diff --git a/.nextchanges/air/watch-retry-notice.md b/.nextchanges/air/watch-retry-notice.md new file mode 100644 index 00000000000..11df8c30fb1 --- /dev/null +++ b/.nextchanges/air/watch-retry-notice.md @@ -0,0 +1 @@ +* Stop printing a retry notice on every `air run --watch`; retries are still reported when they happen. ([#7270](https://github.com/databricks/cli/pull/7270))