changefeedccl: log more details when returning with non-retryable errors

danhhz · danhhz · commit ac74be9665c7 · 2019-04-23T07:42:06.000-07:00
The `%v` and `%+v` were switched from what I intended in the line that
logs retryable errors and the one that handles non-retryable errors.

Release note: None
diff --git a/pkg/ccl/changefeedccl/changefeed_stmt.go b/pkg/ccl/changefeedccl/changefeed_stmt.go
@@ -456,11 +456,11 @@ func (b *changefeedResumer) Resume(
 			return nil
 		}
 		if !IsRetryableError(err) {
-			log.Warningf(ctx, `CHANGEFEED job %d returning with error: %v`, jobID, err)
+			log.Warningf(ctx, `CHANGEFEED job %d returning with error: %+v`, jobID, err)
 			return err
 		}
 
-		log.Warningf(ctx, `CHANGEFEED job %d encountered retryable error: %+v`, jobID, err)
+		log.Warningf(ctx, `CHANGEFEED job %d encountered retryable error: %v`, jobID, err)
 		if metrics, ok := execCfg.JobRegistry.MetricsStruct().Changefeed.(*Metrics); ok {
 			metrics.ErrorRetries.Inc(1)
 		}

Original file line number	Diff line number	Diff line change
`@@ -456,11 +456,11 @@ func (b *changefeedResumer) Resume(`
`456`	`456`	`return nil`
`457`	`457`	`}`
`458`	`458`	`if !IsRetryableError(err) {`
`459`		- log.Warningf(ctx, `CHANGEFEED job %d returning with error: %v`, jobID, err)
	`459`	+ log.Warningf(ctx, `CHANGEFEED job %d returning with error: %+v`, jobID, err)
`460`	`460`	`return err`
`461`	`461`	`}`
`462`	`462`
`463`		- log.Warningf(ctx, `CHANGEFEED job %d encountered retryable error: %+v`, jobID, err)
	`463`	+ log.Warningf(ctx, `CHANGEFEED job %d encountered retryable error: %v`, jobID, err)
`464`	`464`	`if metrics, ok := execCfg.JobRegistry.MetricsStruct().Changefeed.(*Metrics); ok {`
`465`	`465`	`metrics.ErrorRetries.Inc(1)`
`466`	`466`	`}`