disttask: enable on default (#52401)

ref #52441
pingcap · Apr 12, 2024 · 7308ff1 · 7308ff1
1 parent 3fff0f2
commit 7308ff1
Show file tree

Hide file tree

Showing 20 changed files with 89 additions and 144 deletions.
diff --git a/pkg/ddl/ingest/integration_test.go b/pkg/ddl/ingest/integration_test.go
@@ -85,6 +85,7 @@ func TestIngestError(t *testing.T) {
 	store := testkit.CreateMockStore(t)
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("use test;")
+	tk.MustExec("set global tidb_enable_dist_task = 0")
 	defer ingesttestutil.InjectMockBackendMgr(t, store)()
 
 	tk.MustExec("set @@global.tidb_ddl_reorg_worker_cnt = 1;")
@@ -126,6 +127,8 @@ func TestAddIndexIngestPanic(t *testing.T) {
 	tk.MustExec("use test;")
 	defer ingesttestutil.InjectMockBackendMgr(t, store)()
 
+	tk.MustExec("set global tidb_enable_dist_task = 0")
+
 	// Mock panic on coprocessor request sender.
 	require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/ddl/mockCopSenderPanic", "return(true)"))
 	tk.MustExec("create table t (a int, b int, c int, d int, primary key (a) clustered);")

diff --git a/pkg/ddl/ingest/tests/partition_table_test.go b/pkg/ddl/ingest/tests/partition_table_test.go
@@ -32,6 +32,7 @@ func TestAddIndexIngestRecoverPartition(t *testing.T) {
 	defer ingesttestutil.InjectMockBackendMgr(t, tc.Store)()
 	tk := testkit.NewTestKit(t, tc.Store)
 	tk.MustExec("use test;")
+	tk.MustExec("set global tidb_enable_dist_task = 0")
 	tk.MustExec("create table t (a int primary key, b int) partition by hash(a) partitions 8;")
 	tk.MustExec("insert into t values (2, 3), (3, 3), (5, 5);")
 

diff --git a/pkg/ddl/modify_column_test.go b/pkg/ddl/modify_column_test.go
@@ -162,16 +162,10 @@ func TestModifyColumnReorgInfo(t *testing.T) {
 	// Test encountering a "notOwnerErr" error which caused the processing backfill job to exit halfway.
 	// During the period, the old TiDB version(do not exist the element information) is upgraded to the new TiDB version.
 	require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/ddl/MockGetIndexRecordErr", `return("addIdxNotOwnerErr")`))
-	// TODO: Remove this check after "err" isn't nil in runReorgJobAndHandleErr.
-	if variable.EnableDistTask.Load() {
-		err = tk.ExecToErr("alter table t1 add index idx2(c1)")
-		require.EqualError(t, err, "[ddl:8201]TiDB server is not a DDL owner")
-	} else {
-		tk.MustExec("alter table t1 add index idx2(c1)")
-		expectedElements = []*meta.Element{
-			{ID: 7, TypeKey: meta.IndexElementKey}}
-		checkReorgHandle(elements, expectedElements)
-	}
+	tk.MustExec("alter table t1 add index idx2(c1)")
+	expectedElements = []*meta.Element{
+		{ID: 7, TypeKey: meta.IndexElementKey}}
+	checkReorgHandle(elements, expectedElements)
 	tk.MustExec("admin check table t1")
 	require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/ddl/MockGetIndexRecordErr"))
 }

diff --git a/pkg/ddl/multi_schema_change_test.go b/pkg/ddl/multi_schema_change_test.go
@@ -621,6 +621,7 @@ func TestMultiSchemaChangeMixCancelled(t *testing.T) {
 	store, dom := testkit.CreateMockStoreAndDomain(t)
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("use test;")
+	tk.MustExec("set global tidb_enable_dist_task = 0;")
 	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 
 	tk.MustExec("create table t (a int, b int, c int, index i1(c), index i2(c));")

diff --git a/pkg/executor/importer/importer_testkit_test.go b/pkg/executor/importer/importer_testkit_test.go
@@ -157,12 +157,13 @@ func TestVerifyChecksum(t *testing.T) {
 
 func TestGetTargetNodeCpuCnt(t *testing.T) {
 	_, tm, ctx := testutil.InitTableTest(t)
-	require.False(t, variable.EnableDistTask.Load())
+	old := variable.EnableDistTask.Load()
 
+	variable.EnableDistTask.Store(false)
 	require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/util/cpu/mockNumCpu", "return(16)"))
 	t.Cleanup(func() {
 		require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/util/cpu/mockNumCpu"))
-		variable.EnableDistTask.Store(false)
+		variable.EnableDistTask.Store(old)
 	})
 	require.NoError(t, tm.InitMeta(ctx, "tidb1", ""))
 

diff --git a/pkg/executor/test/ddl/BUILD.bazel b/pkg/executor/test/ddl/BUILD.bazel
@@ -22,7 +22,6 @@ go_test(
         "//pkg/parser/model",
         "//pkg/parser/mysql",
         "//pkg/sessionctx/variable",
-        "//pkg/sessionctx/variable/featuretag/disttask",
         "//pkg/sessiontxn",
         "//pkg/store/mockstore",
         "//pkg/table",

diff --git a/pkg/executor/test/ddl/ddl_test.go b/pkg/executor/test/ddl/ddl_test.go
@@ -34,7 +34,6 @@ import (
 	"github.com/pingcap/tidb/pkg/parser/model"
 	"github.com/pingcap/tidb/pkg/parser/mysql"
 	"github.com/pingcap/tidb/pkg/sessionctx/variable"
-	"github.com/pingcap/tidb/pkg/sessionctx/variable/featuretag/disttask"
 	"github.com/pingcap/tidb/pkg/sessiontxn"
 	"github.com/pingcap/tidb/pkg/store/mockstore"
 	"github.com/pingcap/tidb/pkg/table"
@@ -884,14 +883,14 @@ func TestLoadDDLDistributeVars(t *testing.T) {
 	store := testkit.CreateMockStore(t)
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("use test")
-	require.Equal(t, variable.DefTiDBEnableDistTask, disttask.TiDBEnableDistTask)
 
+	require.Equal(t, variable.DefTiDBEnableDistTask, variable.EnableDistTask.Load())
 	tk.MustGetDBError("set @@global.tidb_enable_dist_task = invalid_val", variable.ErrWrongValueForVar)
-	require.Equal(t, disttask.TiDBEnableDistTask, variable.EnableDistTask.Load())
+	require.Equal(t, variable.DefTiDBEnableDistTask, variable.EnableDistTask.Load())
 	tk.MustExec("set @@global.tidb_enable_dist_task = 'on'")
 	require.Equal(t, true, variable.EnableDistTask.Load())
-	tk.MustExec(fmt.Sprintf("set @@global.tidb_enable_dist_task = %v", disttask.TiDBEnableDistTask))
-	require.Equal(t, disttask.TiDBEnableDistTask, variable.EnableDistTask.Load())
+	tk.MustExec(fmt.Sprintf("set @@global.tidb_enable_dist_task = %v", false))
+	require.Equal(t, false, variable.EnableDistTask.Load())
 }
 
 // this test will change the fail-point `mockAutoIDChange`, so we move it to the `testRecoverTable` suite

diff --git a/pkg/session/bootstrap.go b/pkg/session/bootstrap.go
@@ -1310,7 +1310,11 @@ var (
 	SupportUpgradeHTTPOpVer int64 = version174
 )
 
-func checkDistTask(s sessiontypes.Session) {
+func checkDistTask(s sessiontypes.Session, ver int64) {
+	if ver > version195 {
+		// since version195 we enable dist task by default, no need to check
+		return
+	}
 	ctx := kv.WithInternalSourceType(context.Background(), kv.InternalTxnBootstrap)
 	rs, err := s.ExecuteInternal(ctx, "SELECT HIGH_PRIORITY variable_value from mysql.global_variables where variable_name = %?;", variable.TiDBEnableDistTask)
 	if err != nil {
@@ -1361,7 +1365,7 @@ func upgrade(s sessiontypes.Session) {
 		return
 	}
 
-	checkDistTask(s)
+	checkDistTask(s, ver)
 	printClusterState(s, ver)
 
 	// Only upgrade from under version92 and this TiDB is not owner set.