Merge #45883

45883: changefeedccl: check context errors before logging r=nvanbenschoten a=ajwerner Fell out of testing changefeeds. Found some of my database row keys in some logs and found scary-looking errors that were really just due to context cancellation. Release justification: low-risk change Release note: None Co-authored-by: Andrew Werner <[email protected]>
cockroachdb · Mar 20, 2020 · a22a085 · a22a085
2 parents 744bf85 + 99ea2ac
commit a22a085
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkg/ccl/changefeedccl/changefeed_stmt.go b/pkg/ccl/changefeedccl/changefeed_stmt.go
@@ -565,6 +565,9 @@ func (b *changefeedResumer) Resume(
 			return nil
 		}
 		if !IsRetryableError(err) {
+			if ctx.Err() != nil {
+				return ctx.Err()
+			}
 			log.Warningf(ctx, `CHANGEFEED job %d returning with error: %+v`, jobID, err)
 			return err
 		}
@@ -577,6 +580,9 @@ func (b *changefeedResumer) Resume(
 		// been updated by the changeFrontier processor since the flow started.
 		reloadedJob, reloadErr := execCfg.JobRegistry.LoadJob(ctx, jobID)
 		if reloadErr != nil {
+			if ctx.Err() != nil {
+				return ctx.Err()
+			}
 			log.Warningf(ctx, `CHANGEFEED job %d could not reload job progress; `+
 				`continuing from last known high-water of %s: %v`,
 				jobID, progress.GetHighWater(), reloadErr)