ddl: remove logs and fix test

pingcap · May 25, 2023 · cb0a439 · cb0a439
1 parent 097ae28
commit cb0a439
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/ddl/BUILD.bazel b/ddl/BUILD.bazel
@@ -228,6 +228,7 @@ go_test(
         "//ddl/internal/session",
         "//ddl/placement",
         "//ddl/schematracker",
+        "//ddl/syncer",
         "//ddl/testutil",
         "//ddl/util",
         "//disttask/framework/proto",

diff --git a/ddl/job_table_test.go b/ddl/job_table_test.go
@@ -29,7 +29,6 @@ import (
 	"github.com/pingcap/tidb/parser/model"
 	"github.com/pingcap/tidb/testkit"
 	"github.com/pingcap/tidb/util"
-	"github.com/pingcap/tidb/util/logutil"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/exp/slices"
 )
@@ -201,7 +200,9 @@ func TestUpgradingRelatedJobState(t *testing.T) {
 	}
 
 	require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/ddl/mockUpgradingState", `return(true)`))
-	defer require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/ddl/syncer/mockUpgradingState"))
+	defer func() {
+		require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/ddl/mockUpgradingState"))
+	}()
 
 	num := 0
 	hook := &callback.TestDDLCallback{}
@@ -217,28 +218,22 @@ func TestUpgradingRelatedJobState(t *testing.T) {
 			if testCases[num].err != nil && jobs[0].SchemaState == model.StateWriteOnly {
 				tk.MustExec("use test")
 				tk.MustExec(fmt.Sprintf("admin cancel ddl jobs %d", jobs[0].ID))
-				logutil.BgLogger().Warn(fmt.Sprintf("xxx------------------------------------------------cancel job:%s", jobs[0].String()))
 			}
 			if jobs[0].State == testCases[num].jobState {
-				logutil.BgLogger().Warn(fmt.Sprintf("xxx------------------------------------------------upgrading job:%s", jobs[0].String()))
 				dom.DDL().StateSyncer().UpdateGlobalState(context.Background(), &syncer.StateInfo{State: syncer.StateUpgrading})
-				logutil.BgLogger().Warn(fmt.Sprintf("xxx------------------------------------------------upgrading 222 job:%s", jobs[0].String()))
 			}
 			break
 		}
 	}
 	hook.OnGetJobAfterExported = func(jobType string, getJob *model.Job) {
 		if getJob.Query == testCases[num].sql && getJob.State == testCases[num].jobState {
-			logutil.BgLogger().Warn(fmt.Sprintf("xxx------------------------------------------------normal job:%s", getJob.String()))
 			dom.DDL().StateSyncer().UpdateGlobalState(context.Background(), &syncer.StateInfo{State: syncer.StateNormalRunning})
-			logutil.BgLogger().Warn(fmt.Sprintf("xxx------------------------------------------------normal 222 job:%s", getJob.String()))
 		}
 	}
 	d.SetHook(hook)
 
 	for i, tc := range testCases {
 		num = i
-		logutil.BgLogger().Warn(fmt.Sprintf("xxx------------------------------------------------sql:%s", tc.sql))
 		if tc.err == nil {
 			tk.MustExec(tc.sql)
 		} else {

diff --git a/ddl/mock.go b/ddl/mock.go
@@ -16,7 +16,6 @@ package ddl
 
 import (
 	"context"
-	"fmt"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -29,7 +28,6 @@ import (
 	"github.com/pingcap/tidb/parser/model"
 	"github.com/pingcap/tidb/sessionctx"
 	"github.com/pingcap/tidb/sessionctx/variable"
-	"github.com/pingcap/tidb/util/logutil"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	atomicutil "go.uber.org/atomic"
 )
@@ -165,7 +163,6 @@ func (s *MockStateSyncer) Init(context.Context) error {
 func (s *MockStateSyncer) UpdateGlobalState(_ context.Context, stateInfo *syncer.StateInfo) error {
 	failpoint.Inject("mockUpgradingState", func(val failpoint.Value) {
 		if val.(bool) {
-			logutil.BgLogger().Warn(fmt.Sprintf("xxx------------------------------------------------mockUpgradingState *** job:%v", stateInfo))
 			s.clusterState.Store(stateInfo)
 			failpoint.Return(nil)
 		}