Skip to content

Commit

Permalink
changefeedccl: increase chaos roachtest latency limits
Browse files Browse the repository at this point in the history
Resolves: cockroachdb#93238

Since our job-level retry MaxBackoff has increased from 10 seconds to 10 minutes, increase the chaos test latency limits.

Release note: None

<what was there before: Previously, ...>
<why it needed to change: This was inadequate because ...>
<what you did about it: To address this, this patch ...>
  • Loading branch information
samiskin committed Dec 15, 2022
1 parent 9af72fb commit 4ccf567
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions pkg/ccl/changefeedccl/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ go_library(
"//pkg/util/ctxgroup",
"//pkg/util/duration",
"//pkg/util/encoding/csv",
"//pkg/util/envutil",
"//pkg/util/hlc",
"//pkg/util/httputil",
"//pkg/util/humanizeutil",
Expand Down
6 changes: 4 additions & 2 deletions pkg/ccl/changefeedccl/retry.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ import (
"context"
"time"

"github.com/cockroachdb/cockroach/pkg/util/envutil"
"github.com/cockroachdb/cockroach/pkg/util/retry"
"github.com/cockroachdb/cockroach/pkg/util/timeutil"
)

var useFastRetry = false
var useFastRetry = envutil.EnvOrDefaultBool(
"COCKROACH_CHANGEFEED_TESTING_FAST_RETRY", false)

// getRetry returns retry object for changefeed.
func getRetry(ctx context.Context) Retry {
Expand All @@ -30,7 +32,7 @@ func getRetry(ctx context.Context) Retry {
opts = retry.Options{
InitialBackoff: 5 * time.Millisecond,
Multiplier: 2,
MaxBackoff: 250 * time.Minute,
MaxBackoff: 250 * time.Millisecond,
}
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/roachtest/tests/cdc.go
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ func newCDCTester(ctx context.Context, t test.Test, c cluster.Cluster) cdcTester
c.Put(ctx, t.Cockroach(), "./cockroach")

settings := install.MakeClusterSettings()
settings.Env = append(settings.Env, "COCKROACH_EXPERIMENTAL_ENABLE_PER_CHANGEFEED_METRICS=true")
settings.Env = append(settings.Env, "COCKROACH_CHANGEFEED_TESTING_FAST_RETRY=true")
c.Start(ctx, t.L(), option.DefaultStartOpts(), settings, tester.crdbNodes)

c.Put(ctx, t.DeprecatedWorkload(), "./workload", tester.workloadNode)
Expand Down

0 comments on commit 4ccf567

Please sign in to comment.