http_*: fix tests

cdc/capture/http_validator.go

@@ -139,7 +139,7 @@ func verifyCreateChangefeedConfig(ctx context.Context, changefeedConfig model.Ch
 
 	tz, err := util.GetTimezone(changefeedConfig.TimeZone)
 	if err != nil {
-		return nil, errors.Annotate(err, "invalid timezone:"+changefeedConfig.TimeZone)
+		return nil, cerror.ErrAPIInvalidParam.Wrap(errors.Annotate(err, "invalid timezone:"+changefeedConfig.TimeZone))
 	}
 	ctx = util.PutTimezoneInCtx(ctx, tz)
 	if err := sink.Validate(ctx, info.SinkURI, info.Config, info.Opts); err != nil {

cdc/http_router.go

@@ -20,15 +20,12 @@ import (
 	"net/http/pprof"
 	"time"
 
-	"github.com/pingcap/ticdc/pkg/config"
-
-	"github.com/pingcap/errors"
-	"github.com/pingcap/ticdc/cdc/model"
-	cerror "github.com/pingcap/ticdc/pkg/errors"
-
 	"github.com/gin-gonic/gin"
 	"github.com/pingcap/log"
 	"github.com/pingcap/ticdc/cdc/capture"
+	"github.com/pingcap/ticdc/cdc/model"
+	"github.com/pingcap/ticdc/pkg/config"
+	cerror "github.com/pingcap/ticdc/pkg/errors"
 	swaggerFiles "github.com/swaggo/files"
 	ginSwagger "github.com/swaggo/gin-swagger"
 	"go.uber.org/zap"
@@ -141,10 +138,10 @@ func logMiddleware() gin.HandlerFunc {
 
 		cost := time.Since(start)
 
-		var errMessage string
 		err := c.Errors.Last()
+		var inErr error
 		if err != nil {
-			errMessage = errors.Trace(c.Errors.Last().Err).Error()
+			inErr = err.Err
 		}
 
 		log.Info(path,
@@ -154,7 +151,7 @@ func logMiddleware() gin.HandlerFunc {
 			zap.String("query", query),
 			zap.String("ip", c.ClientIP()),
 			zap.String("user-agent", c.Request.UserAgent()),
-			zap.String("errors", errMessage),
+			zap.Error(inErr),
 			zap.Duration("cost", cost),
 		)
 	}

pkg/cmd/server/server_test.go

@@ -154,6 +154,7 @@ func (s *serverSuite) TestParseCfg(c *check.C) {
 		AdvertiseAddr: "127.5.5.1:7777",
 		LogFile:       "/root/cdc.log",
 		LogLevel:      "debug",
+		LogHTTP:       true,
 		Log: &config.LogConfig{
 			File: &config.LogFileConfig{
 				MaxSize:    300,
@@ -240,6 +241,7 @@ sort-dir = "/tmp/just_a_test"
 		AdvertiseAddr: "127.0.0.1:1111",
 		LogFile:       "/root/cdc1.log",
 		LogLevel:      "warn",
+		LogHTTP:       true,
 		Log: &config.LogConfig{
 			File: &config.LogFileConfig{
 				MaxSize:    200,
@@ -343,6 +345,7 @@ cert-allowed-cn = ["dd","ee"]
 		AdvertiseAddr: "127.0.0.1:1111",
 		LogFile:       "/root/cdc.log",
 		LogLevel:      "debug",
+		LogHTTP:       true,
 		Log: &config.LogConfig{
 			File: &config.LogFileConfig{
 				MaxSize:    200,

pkg/config/config_test.go

@@ -69,7 +69,7 @@ func TestReplicaConfigOutDated(t *testing.T) {
 
 func TestServerConfigMarshal(t *testing.T) {
 	t.Parallel()
-	rawConfig := `{"addr":"192.155.22.33:8887","advertise-addr":"","log-file":"","log-level":"info","log":{"file":{"max-size":300,"max-days":0,"max-backups":0}},"data-dir":"","gc-ttl":86400,"tz":"System","capture-session-ttl":10,"owner-flush-interval":200000000,"processor-flush-interval":100000000,"sorter":{"num-concurrent-worker":4,"chunk-size-limit":999,"max-memory-percentage":30,"max-memory-consumption":17179869184,"num-workerpool-goroutine":16,"sort-dir":"/tmp/sorter"},"security":{"ca-path":"","cert-path":"","key-path":"","cert-allowed-cn":null},"per-table-memory-quota":20971520,"kv-client":{"worker-concurrent":8,"worker-pool-size":0,"region-scan-limit":40}}`
+	rawConfig := `{"addr":"192.155.22.33:8887","advertise-addr":"","log-file":"","log-level":"info","log_http":true,"log":{"file":{"max-size":300,"max-days":0,"max-backups":0}},"data-dir":"","gc-ttl":86400,"tz":"System","capture-session-ttl":10,"owner-flush-interval":200000000,"processor-flush-interval":100000000,"sorter":{"num-concurrent-worker":4,"chunk-size-limit":999,"max-memory-percentage":30,"max-memory-consumption":17179869184,"num-workerpool-goroutine":16,"sort-dir":"/tmp/sorter"},"security":{"ca-path":"","cert-path":"","key-path":"","cert-allowed-cn":null},"per-table-memory-quota":20971520,"kv-client":{"worker-concurrent":8,"worker-pool-size":0,"region-scan-limit":40}}`
 
 	conf := GetDefaultServerConfig()
 	conf.Addr = "192.155.22.33:8887"

pkg/errors/helper.go

@@ -15,6 +15,7 @@ package errors
 
 import (
 	"context"
+	"strings"
 
 	"github.com/pingcap/errors"
 )
@@ -78,7 +79,8 @@ func IsRetryableError(err error) bool {
 var BadRequestError = []*errors.Error{
 	ErrAPIInvalidParam, ErrSinkURIInvalid, ErrStartTsBeforeGC,
 	ErrChangeFeedNotExists, ErrTargetTsBeforeStartTs, ErrTableIneligible,
-	ErrFilterRuleInvalid, ErrChangefeedUpdateRefused,
+	ErrFilterRuleInvalid, ErrChangefeedUpdateRefused, ErrMySQLConnectionError,
+	ErrMySQLInvalidConfig,
 }
 
 func IsHTTPBadRequestError(err error) bool {
@@ -89,6 +91,15 @@ func IsHTTPBadRequestError(err error) bool {
 		if e.Equal(err) {
 			return true
 		}
+
+		rfcCode, ok := RFCCode(err)
+		if ok && e.RFCCode() == rfcCode {
+			return true
+		}
+
+		if strings.Contains(err.Error(), string(e.RFCCode())) {
+			return true
+		}
 	}
 	return false
 }

pkg/errors/helper_test.go

@@ -68,6 +68,8 @@ func TestIsRetryableError(t *testing.T) {
 func TestIsBadRequestError(t *testing.T) {
 	err := ErrAPIInvalidParam.GenWithStack("aa")
 	require.Equal(t, true, IsHTTPBadRequestError(err))
+	err = ErrAPIInvalidParam.Wrap(errors.New("aa"))
+	require.Equal(t, true, IsHTTPBadRequestError(err))
 	err = ErrPDEtcdAPIError.GenWithStack("aa")
 	require.Equal(t, false, IsHTTPBadRequestError(err))
 	err = nil