Skip to content

Commit

Permalink
Merge pull request #127552 from cockroachdb/blathers/backport-release…
Browse files Browse the repository at this point in the history
…-24.2-127530

release-24.2: changefeedccl: add log messages for when a core changefeed retries/fails
  • Loading branch information
andyyang890 authored Jul 20, 2024
2 parents f93f42b + 7391dd2 commit 60d3fb8
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkg/ccl/changefeedccl/changefeed_stmt.go
Original file line number Diff line number Diff line change
Expand Up @@ -355,12 +355,14 @@ func coreChangefeed(
err = knobs.HandleDistChangefeedError(err)
}

if err = changefeedbase.AsTerminalError(ctx, p.ExecCfg().LeaseManager, err); err != nil {
if err := changefeedbase.AsTerminalError(ctx, p.ExecCfg().LeaseManager, err); err != nil {
log.Infof(ctx, "core changefeed failed due to error: %s", err)
return err
}

// All other errors retry; but we'll use an up-to-date progress
// information which is saved in the localState.
log.Infof(ctx, "core changefeed retrying due to transient error: %s", err)
}
return ctx.Err() // retry loop exits when context cancels.
}
Expand Down

0 comments on commit 60d3fb8

Please sign in to comment.