Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .nextchanges/air/watch-retry-notice.md
Original file line number Diff line number Diff line change
@@ -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))
7 changes: 0 additions & 7 deletions cmd/air/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down
3 changes: 2 additions & 1 deletion cmd/air/run_watch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading