Merge branch 'master' into release-4.0

.editorconfig

@@ -0,0 +1,10 @@
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+
+# tab_size = 4 spaces
+[*.go]
+indent_style = tab
+indent_size = 4
+trim_trailing_whitespace = true

Makefile

@@ -39,11 +39,12 @@ FAILPOINT := bin/failpoint-ctl
 FAILPOINT_ENABLE  := $$(echo $(FAILPOINT_DIR) | xargs $(FAILPOINT) enable >/dev/null)
 FAILPOINT_DISABLE := $$(find $(FAILPOINT_DIR) | xargs $(FAILPOINT) disable >/dev/null)
 
-LDFLAGS += -X "$(CDC_PKG)/pkg/util.BuildTS=$(shell date -u '+%Y-%m-%d %H:%M:%S')"
-LDFLAGS += -X "$(CDC_PKG)/pkg/util.GitHash=$(shell git rev-parse HEAD)"
-LDFLAGS += -X "$(CDC_PKG)/pkg/util.ReleaseVersion=$(shell git describe --tags --dirty="-dev")"
-LDFLAGS += -X "$(CDC_PKG)/pkg/util.GitBranch=$(shell git rev-parse --abbrev-ref HEAD)"
-LDFLAGS += -X "$(CDC_PKG)/pkg/util.GoVersion=$(shell go version)"
+RELEASE_VERSION ?= $(shell git describe --tags --dirty="-dev")
+LDFLAGS += -X "$(CDC_PKG)/pkg/version.ReleaseVersion=$(RELEASE_VERSION)"
+LDFLAGS += -X "$(CDC_PKG)/pkg/version.BuildTS=$(shell date -u '+%Y-%m-%d %H:%M:%S')"
+LDFLAGS += -X "$(CDC_PKG)/pkg/version.GitHash=$(shell git rev-parse HEAD)"
+LDFLAGS += -X "$(CDC_PKG)/pkg/version.GitBranch=$(shell git rev-parse --abbrev-ref HEAD)"
+LDFLAGS += -X "$(CDC_PKG)/pkg/version.GoVersion=$(shell go version)"
 
 default: build buildsucc
 
@@ -102,10 +103,10 @@ integration_test_build: check_failpoint_ctl
 integration_test: integration_test_mysql
 
 integration_test_mysql: check_third_party_binary
-	tests/run.sh $(CASE) mysql
+	tests/run.sh mysql $(CASE)
 
 integration_test_kafka: check_third_party_binary
-	tests/run.sh $(CASE) kafka
+	tests/run.sh kafka $(CASE)
 
 fmt:
 	@echo "gofmt (simplify)"

cdc/changefeed.go

@@ -743,7 +743,7 @@ func (c *changeFeed) calcResolvedTs(ctx context.Context) error {
 			minResolvedTs = appliedTs
 		}
 		if appliedTs != math.MaxUint64 {
-			log.Info("some operation is still unapplied",
+			log.Debug("some operation is still unapplied",
 				zap.String("captureID", captureID),
 				zap.Uint64("appliedTs", appliedTs),
 				zap.Stringer("status", status))

cdc/http_status.go

@@ -28,7 +28,7 @@ import (
 	"github.com/pingcap/ticdc/cdc/kv"
 	cerror "github.com/pingcap/ticdc/pkg/errors"
 	"github.com/pingcap/ticdc/pkg/security"
-	"github.com/pingcap/ticdc/pkg/util"
+	"github.com/pingcap/ticdc/pkg/version"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"go.etcd.io/etcd/clientv3"
@@ -128,8 +128,8 @@ func (s *Server) handleStatus(w http.ResponseWriter, req *http.Request) {
 	s.ownerLock.RLock()
 	defer s.ownerLock.RUnlock()
 	st := status{
-		Version: util.ReleaseVersion,
-		GitHash: util.GitHash,
+		Version: version.ReleaseVersion,
+		GitHash: version.GitHash,
 		Pid:     os.Getpid(),
 	}
 	if s.capture != nil {