Skip to content

Commit fcc95cf

Browse files
author
Yevgeniy Miretskiy
committed
roachtest: Reset job load attempt when loading cdc job
Fixes cockroachdb#108433 Release note: None
1 parent 8fc7974 commit fcc95cf

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

pkg/cmd/roachtest/tests/cdc_bench.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,8 @@ func waitForChangefeed(
548548
) (changefeedInfo, error) {
549549
ticker := time.NewTicker(5 * time.Second)
550550
defer ticker.Stop()
551-
for attempt := 0; ; attempt++ {
551+
const maxLoadJobAttempts = 5
552+
for loadJobAttempt := 0; ; loadJobAttempt++ {
552553
select {
553554
case <-ticker.C:
554555
case <-ctx.Done():
@@ -557,9 +558,9 @@ func waitForChangefeed(
557558

558559
info, err := getChangefeedInfo(conn, jobID)
559560
if err != nil {
560-
logger.Errorf("error getting changefeed info: %v (attempt %d)", err, attempt+1)
561-
if attempt > 5 {
562-
return changefeedInfo{}, errors.Wrap(err, "failed 5 attempts to get changefeed info")
561+
logger.Errorf("error getting changefeed info: %v (attempt %d)", err, loadJobAttempt+1)
562+
if loadJobAttempt > 5 {
563+
return changefeedInfo{}, errors.Wrapf(err, "failed %d attempts to get changefeed info", maxLoadJobAttempts)
563564
}
564565
continue
565566
} else if info.errMsg != "" {
@@ -570,6 +571,7 @@ func waitForChangefeed(
570571
} else if ok {
571572
return *info, nil
572573
}
574+
loadJobAttempt = 0
573575
}
574576
}
575577

0 commit comments

Comments
 (0)