Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

release-23.2.0-rc: pcr: extend retries to a few minutes #116404

Merged
merged 2 commits into from Dec 16, 2023
Merged

release-23.2.0-rc: pcr: extend retries to a few minutes #116404

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
094dbbf
pcr: extend retries to a few minutes
dt Dec 13, 2023
c5e2e1e
pcr: clarify status during retry
dt Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 12 additions & 7 deletions pkg/ccl/streamingccl/streamingest/stream_ingestion_job.go
View file
Open in desktop
Expand Up @@ -196,11 +196,12 @@ func getRetryPolicy(knobs *sql.StreamingTestingKnobs) retry.Options {
if knobs != nil && knobs.DistSQLRetryPolicy != nil {
return *knobs.DistSQLRetryPolicy
}
return retry.Options{
InitialBackoff: time.Microsecond,
Multiplier: 1,
MaxBackoff: 2 * time.Microsecond,
MaxRetries: 20}

// This feature is potentially running over WAN network links / the public
// internet, so we want to recover on our own from hiccups that could last a
// few seconds or even minutes. Thus we allow a relatively long MaxBackoff and
// number of retries that should cause us to retry for a few minutes.
return retry.Options{MaxBackoff: 15 * time.Second, MaxRetries: 20} // 205.5s.
}

func ingestWithRetries(
Expand All @@ -222,8 +223,12 @@ func ingestWithRetries(
if jobs.IsPermanentJobError(err) || errors.Is(err, context.Canceled) {
break
}
status := redact.Sprintf("waiting before retrying error: %s", err)
updateRunningStatus(ctx, ingestionJob, jobspb.ReplicationError, status)
// If we're retrying repeatedly, update the status to reflect the error we
// are hitting.
if i := r.CurrentAttempt(); i > 5 {
status := redact.Sprintf("retrying after error on attempt %d: %s", i, err)
updateRunningStatus(ctx, ingestionJob, jobspb.ReplicationError, status)
}
newReplicatedTime := loadReplicatedTime(ctx, execCtx.ExecCfg().InternalDB, ingestionJob)
if lastReplicatedTime.Less(newReplicatedTime) {
r.Reset()
Expand Down