Skip to content

Commit

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

release-24.2: crosscluster/physical: use correct lag replan cluster setting
  • Loading branch information
msbutler authored Sep 27, 2024
2 parents e35a012 + c9d2e91 commit 83e8534
Showing 1 changed file with 1 addition and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -423,11 +423,7 @@ func (sf *streamIngestionFrontier) maybePersistFrontierEntries() error {

func (sf *streamIngestionFrontier) maybeCheckForLaggingNodes() error {
ctx := sf.Ctx()

// We halve the frequency relative to the ReplanFrequency setting (i.e.
// check twice as often), because the node lag checker will only restart the
// distSQL plan if a node is lagging for 2 checks in a row.
checkFreq := crosscluster.ReplanFrequency.Get(&sf.FlowCtx.Cfg.Settings.SV) / 2
checkFreq := crosscluster.LagCheckFrequency.Get(&sf.FlowCtx.Cfg.Settings.SV)
maxLag := crosscluster.InterNodeLag.Get(&sf.FlowCtx.Cfg.Settings.SV)
if sf.persistedReplicatedTime.IsEmpty() {
log.VEvent(ctx, 2, "skipping lag replanning check: no persisted replicated time")
Expand Down

0 comments on commit 83e8534

Please sign in to comment.