Merge branch 'master' into fix-unit-test-2500

pingcap · Aug 19, 2021 · efd3b62 · efd3b62
2 parents 87defc5 + 37a76fc
commit efd3b62
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 4,570 deletions.
diff --git a/cdc/changefeed.go b/cdc/changefeed.go
diff --git a/cdc/changefeed_test.go b/cdc/changefeed_test.go
diff --git a/cdc/metrics.go b/cdc/metrics.go
@@ -43,7 +43,6 @@ func init() {
 		owner.InitMetrics(registry)
 	} else {
 		initProcessorMetrics(registry)
-		initOwnerMetrics(registry)
 	}
 	initServerMetrics(registry)
 }
diff --git a/cdc/metrics_owner.go b/cdc/metrics_owner.go