Merge branch 'master' into rustin-patch-cancellable

engine/client/client_test.go

@@ -54,6 +54,7 @@ func TestClientManager(t *testing.T) {
 
 	masterServer, err := servermaster.NewServer(masterCfg, test.NewContext())
 	require.Nil(t, err)
+	masterServer.Stop()
 
 	masterCtx, masterCancel := context.WithCancel(ctx)
 	defer masterCancel()

engine/client/main_test.go

@@ -0,0 +1,31 @@
+// Copyright 2022 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package client
+
+import (
+	"testing"
+
+	"github.com/pingcap/tiflow/pkg/leakutil"
+	"go.uber.org/goleak"
+)
+
+func TestMain(m *testing.M) {
+	opts := []goleak.Option{
+		// TODO: remove the following lines after executor manager supports to
+		// remove failed clients. Otherwise test case TestAddNonExistentExecutor
+		// will fail.
+		goleak.IgnoreTopFunction("google.golang.org/grpc.(*addrConn).resetTransport"),
+		goleak.IgnoreTopFunction("google.golang.org/grpc.(*ccBalancerWrapper).watcher"),
+	}
+	leakutil.SetUpLeakTest(m, opts...)
+}

engine/executor/dm/main_test.go

@@ -0,0 +1,25 @@
+// Copyright 2022 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package dm
+
+import (
+	"testing"
+
+	"github.com/pingcap/tiflow/pkg/leakutil"
+)
+
+// TODO: enable leak test
+//nolint:deadcode
+func testMain(m *testing.M) {
+	leakutil.SetUpLeakTest(m)
+}

engine/executor/main_test.go

@@ -0,0 +1,25 @@
+// Copyright 2022 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package executor
+
+import (
+	"testing"
+
+	"github.com/pingcap/tiflow/pkg/leakutil"
+)
+
+// TODO: enable leak test in executor package
+//nolint:deadcode
+func testMain(m *testing.M) {
+	leakutil.SetUpLeakTest(m)
+}

engine/executor/server/main_test.go

@@ -0,0 +1,23 @@
+// Copyright 2022 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package server
+
+import (
+	"testing"
+
+	"github.com/pingcap/tiflow/pkg/leakutil"
+)
+
+func TestMain(m *testing.M) {
+	leakutil.SetUpLeakTest(m)
+}

engine/executor/worker/main_test.go

@@ -0,0 +1,23 @@
+// Copyright 2022 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package worker
+
+import (
+	"testing"
+
+	"github.com/pingcap/tiflow/pkg/leakutil"
+)
+
+func TestMain(m *testing.M) {
+	leakutil.SetUpLeakTest(m)
+}

engine/framework/config/main_test.go

@@ -0,0 +1,23 @@
+// Copyright 2022 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package config
+
+import (
+	"testing"
+
+	"github.com/pingcap/tiflow/pkg/leakutil"
+)
+
+func TestMain(m *testing.M) {
+	leakutil.SetUpLeakTest(m)
+}

engine/framework/internal/errors/main_test.go

@@ -0,0 +1,23 @@
+// Copyright 2022 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package errors
+
+import (
+	"testing"
+
+	"github.com/pingcap/tiflow/pkg/leakutil"
+)
+
+func TestMain(m *testing.M) {
+	leakutil.SetUpLeakTest(m)
+}

engine/framework/internal/eventloop/main_test.go

@@ -0,0 +1,23 @@
+// Copyright 2022 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package eventloop
+
+import (
+	"testing"
+
+	"github.com/pingcap/tiflow/pkg/leakutil"
+)
+
+func TestMain(m *testing.M) {
+	leakutil.SetUpLeakTest(m)
+}

engine/framework/internal/master/main_test.go

@@ -0,0 +1,23 @@
+// Copyright 2022 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package master
+
+import (
+	"testing"
+
+	"github.com/pingcap/tiflow/pkg/leakutil"
+)
+
+func TestMain(m *testing.M) {
+	leakutil.SetUpLeakTest(m)
+}

engine/framework/internal/worker/main_test.go

@@ -0,0 +1,23 @@
+// Copyright 2022 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package worker
+
+import (
+	"testing"
+
+	"github.com/pingcap/tiflow/pkg/leakutil"
+)
+
+func TestMain(m *testing.M) {
+	leakutil.SetUpLeakTest(m)
+}

engine/framework/internal/worker/master_client_test.go

@@ -110,6 +110,7 @@ func (h *masterClientTestHelper) WaitWorkerClosed(t *testing.T) error {
 
 func TestMasterClientRefreshInfo(t *testing.T) {
 	helper := newMasterClientTestHelper("master-1", "worker-1")
+	defer helper.Meta.Close()
 	err := helper.Meta.UpsertJob(context.Background(), &frameModel.MasterMetaKVData{
 		ID:         "master-1",
 		StatusCode: frameModel.MasterStatusInit,
@@ -144,6 +145,7 @@ func TestMasterClientRefreshInfo(t *testing.T) {
 
 func TestMasterClientHeartbeat(t *testing.T) {
 	helper := newMasterClientTestHelper("master-1", "worker-1")
+	defer helper.Meta.Close()
 	err := helper.Meta.UpsertJob(context.Background(), &frameModel.MasterMetaKVData{
 		ID:         "master-1",
 		StatusCode: frameModel.MasterStatusInit,
@@ -220,6 +222,7 @@ func TestMasterClientHeartbeat(t *testing.T) {
 
 func TestMasterClientHeartbeatMismatch(t *testing.T) {
 	helper := newMasterClientTestHelper("master-1", "worker-1")
+	defer helper.Meta.Close()
 	err := helper.Meta.UpsertJob(context.Background(), &frameModel.MasterMetaKVData{
 		ID:         "master-1",
 		StatusCode: frameModel.MasterStatusInit,
@@ -273,6 +276,7 @@ func TestMasterClientHeartbeatLargerEpoch(t *testing.T) {
 	// with a larger Epoch.
 
 	helper := newMasterClientTestHelper("master-1", "worker-1")
+	defer helper.Meta.Close()
 	err := helper.Meta.UpsertJob(context.Background(), &frameModel.MasterMetaKVData{
 		ID:         "master-1",
 		StatusCode: frameModel.MasterStatusInit,
@@ -307,6 +311,7 @@ func TestMasterClientHeartbeatLargerEpoch(t *testing.T) {
 
 func TestMasterClientTimeoutFromInit(t *testing.T) {
 	helper := newMasterClientTestHelper("master-1", "worker-1")
+	defer helper.Meta.Close()
 	err := helper.Meta.UpsertJob(context.Background(), &frameModel.MasterMetaKVData{
 		ID:         "master-1",
 		StatusCode: frameModel.MasterStatusInit,
@@ -335,6 +340,7 @@ func TestMasterClientCheckTimeoutRefreshMaster(t *testing.T) {
 	// master info automatically.
 
 	helper := newMasterClientTestHelper("master-1", "worker-1")
+	defer helper.Meta.Close()
 	err := helper.Meta.UpsertJob(context.Background(), &frameModel.MasterMetaKVData{
 		ID:         "master-1",
 		StatusCode: frameModel.MasterStatusInit,
@@ -383,6 +389,7 @@ func TestMasterClientSendHeartbeatRefreshMaster(t *testing.T) {
 	// a heartbeat, a master info refresh is triggered.
 
 	helper := newMasterClientTestHelper("master-1", "worker-1")
+	defer helper.Meta.Close()
 	err := helper.Meta.UpsertJob(context.Background(), &frameModel.MasterMetaKVData{
 		ID:         "master-1",
 		StatusCode: frameModel.MasterStatusInit,
@@ -422,6 +429,7 @@ func TestMasterClientSendHeartbeatRefreshMaster(t *testing.T) {
 
 func TestMasterClientHeartbeatStalePong(t *testing.T) {
 	helper := newMasterClientTestHelper("master-1", "worker-1")
+	defer helper.Meta.Close()
 	err := helper.Meta.UpsertJob(context.Background(), &frameModel.MasterMetaKVData{
 		ID:         "master-1",
 		StatusCode: frameModel.MasterStatusInit,

engine/framework/logutil/main_test.go

@@ -0,0 +1,23 @@
+// Copyright 2022 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package logutil
+
+import (
+	"testing"
+
+	"github.com/pingcap/tiflow/pkg/leakutil"
+)
+
+func TestMain(m *testing.M) {
+	leakutil.SetUpLeakTest(m)
+}

engine/framework/main_test.go

@@ -0,0 +1,25 @@
+// Copyright 2022 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package framework
+
+import (
+	"testing"
+
+	"github.com/pingcap/tiflow/pkg/leakutil"
+)
+
+// TODO: enable leak test in this package
+//nolint:deadcode
+func testMain(m *testing.M) {
+	leakutil.SetUpLeakTest(m)
+}

engine/framework/metadata/main_test.go

@@ -0,0 +1,23 @@
+// Copyright 2022 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package metadata
+
+import (
+	"testing"
+
+	"github.com/pingcap/tiflow/pkg/leakutil"
+)
+
+func TestMain(m *testing.M) {
+	leakutil.SetUpLeakTest(m)
+}