database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dxf: rename the pkg from "disttask" to "dxf" (#65396)

Browse Source 
ref pingcap/tidb#61702
This commit is contained in:
D3Hunter
2026-01-05 08:30:59 +08:00
committed by GitHub
parent 76cbd72ef9
commit c342953b2d
259 changed files with 857 additions and 857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@ -1,3 +1,3 @@
# Contributing Guide
See the [Contributing Guide](https://github.com/pingcap/community/blob/master/contributors/README.md) in the [community](https://github.com/pingcap/community) repository.
See the [Contributing Guide](https://github.com/pingcap/community/blob/master/contributors/README.md) in the [community](https://github.com/pingcap/community) repository.

14
Makefile
View File

@ -550,13 +550,13 @@ mock_import: mockgen
tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/lightning/backend/encode Encoder,EncodingBuilder,Rows,Row > br/pkg/mock/encode.go
tools/bin/mockgen -package mocklocal github.com/pingcap/tidb/pkg/lightning/backend/local DiskUsage,TiKVModeSwitcher,StoreHelper > br/pkg/mock/mocklocal/local.go
tools/bin/mockgen -package mock github.com/pingcap/tidb/br/pkg/utils TaskRegister > br/pkg/mock/task_register.go
tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor TaskTable,TaskExecutor,Extension > pkg/disttask/framework/mock/task_executor_mock.go
tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/disttask/framework/scheduler Scheduler,CleanUpRoutine,TaskManager > pkg/disttask/framework/mock/scheduler_mock.go
tools/bin/mockgen -destination pkg/disttask/framework/scheduler/mock/scheduler_mock.go -package mock github.com/pingcap/tidb/pkg/disttask/framework/scheduler Extension
tools/bin/mockgen -embed -package mockexecute github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute StepExecutor > pkg/disttask/framework/mock/execute/execute_mock.go
tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/disttask/importinto MiniTaskExecutor > pkg/disttask/importinto/mock/import_mock.go
tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/disttask/framework/planner LogicalPlan,PipelineSpec > pkg/disttask/framework/mock/plan_mock.go
tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/disttask/framework/storage Manager > pkg/disttask/framework/mock/storage_manager_mock.go
tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor TaskTable,TaskExecutor,Extension > pkg/dxf/framework/mock/task_executor_mock.go
tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/dxf/framework/scheduler Scheduler,CleanUpRoutine,TaskManager > pkg/dxf/framework/mock/scheduler_mock.go
tools/bin/mockgen -destination pkg/dxf/framework/scheduler/mock/scheduler_mock.go -package mock github.com/pingcap/tidb/pkg/dxf/framework/scheduler Extension
tools/bin/mockgen -embed -package mockexecute github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute StepExecutor > pkg/dxf/framework/mock/execute/execute_mock.go
tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/dxf/importinto MiniTaskExecutor > pkg/dxf/importinto/mock/import_mock.go
tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/dxf/framework/planner LogicalPlan,PipelineSpec > pkg/dxf/framework/mock/plan_mock.go
tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/dxf/framework/storage Manager > pkg/dxf/framework/mock/storage_manager_mock.go
tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/ingestor/ingestcli Client,WriteClient > pkg/ingestor/ingestcli/mock/client_mock.go
tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/importsdk FileScanner,JobManager,SQLGenerator,SDK > pkg/importsdk/mock/sdk_mock.go
tools/bin/mockgen -package mock github.com/pingcap/tidb/lightning/pkg/importinto CheckpointManager > lightning/pkg/importinto/mock/import_mock.go

4
build/nogo_config.json
View File

@ -573,7 +573,7 @@
"pkg/expression/builtin_cast.go": "expression/builtin_cast code",
"pkg/server/": "server/ code",
"pkg/distsql/": "distsql code",
"pkg/disttask": "disttask code",
"pkg/dxf": "DXF code",
"dumpling/export": "dumpling/export code",
"pkg/lock/": "lock file",
"pkg/errno/": "errno code",
@ -690,7 +690,7 @@
"br/": "br code",
"pkg/session/test": "session/test code",
"pkg/ddl/tests": "ddl/tests code",
"pkg/disttask/": "disttask code",
"pkg/dxf/": "DXF code",
"pkg/timer/": "timer code",
"pkg/util/": "util code",
"pkg/lightning/config/": "pkg/lightning/config code",

30
pkg/ddl/BUILD.bazel
View File

@ -96,17 +96,17 @@ go_library(
"//pkg/ddl/util",
"//pkg/distsql",
"//pkg/distsql/context",
"//pkg/disttask/framework/dxfmetric",
"//pkg/disttask/framework/handle",
"//pkg/disttask/framework/metering",
"//pkg/disttask/framework/proto",
"//pkg/disttask/framework/scheduler",
"//pkg/disttask/framework/storage",
"//pkg/disttask/framework/taskexecutor",
"//pkg/disttask/framework/taskexecutor/execute",
"//pkg/disttask/operator",
"//pkg/domain/affinity",
"//pkg/domain/infosync",
"//pkg/dxf/framework/dxfmetric",
"//pkg/dxf/framework/handle",
"//pkg/dxf/framework/metering",
"//pkg/dxf/framework/proto",
"//pkg/dxf/framework/scheduler",
"//pkg/dxf/framework/storage",
"//pkg/dxf/framework/taskexecutor",
"//pkg/dxf/framework/taskexecutor/execute",
"//pkg/dxf/operator",
"//pkg/errctx",
"//pkg/expression",
"//pkg/expression/exprctx",
@ -321,16 +321,16 @@ go_test(
"//pkg/ddl/testutil",
"//pkg/ddl/util",
"//pkg/distsql/context",
"//pkg/disttask/framework/mock",
"//pkg/disttask/framework/proto",
"//pkg/disttask/framework/scheduler",
"//pkg/disttask/framework/storage",
"//pkg/disttask/framework/taskexecutor/execute",
"//pkg/disttask/operator",
"//pkg/domain",
"//pkg/domain/affinity",
"//pkg/domain/infosync",
"//pkg/domain/serverinfo",
"//pkg/dxf/framework/mock",
"//pkg/dxf/framework/proto",
"//pkg/dxf/framework/scheduler",
"//pkg/dxf/framework/storage",
"//pkg/dxf/framework/taskexecutor/execute",
"//pkg/dxf/operator",
"//pkg/errctx",
"//pkg/errno",
"//pkg/executor",

4
pkg/ddl/backfilling.go
View File

@ -31,8 +31,8 @@ import (
"github.com/pingcap/tidb/pkg/ddl/ingest"
"github.com/pingcap/tidb/pkg/ddl/logutil"
sess "github.com/pingcap/tidb/pkg/ddl/session"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/disttask/operator"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/dxf/operator"
"github.com/pingcap/tidb/pkg/expression"
"github.com/pingcap/tidb/pkg/expression/exprctx"
"github.com/pingcap/tidb/pkg/expression/exprstatic"

10
pkg/ddl/backfilling_clean_s3.go
View File

@ -22,11 +22,11 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/tidb/br/pkg/storage"
"github.com/pingcap/tidb/pkg/config/kerneltype"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/scheduler"
dxfstorage "github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/scheduler"
dxfstorage "github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/lightning/backend/external"
"github.com/pingcap/tidb/pkg/parser/ast"
"github.com/pingcap/tidb/pkg/util/logutil"

6
pkg/ddl/backfilling_dist_executor.go
View File

@ -22,9 +22,9 @@ import (
"github.com/pingcap/tidb/br/pkg/storage"
"github.com/pingcap/tidb/pkg/ddl/logutil"
sess "github.com/pingcap/tidb/pkg/ddl/session"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/lightning/backend/external"
"github.com/pingcap/tidb/pkg/lightning/common"
"github.com/pingcap/tidb/pkg/meta/model"

10
pkg/ddl/backfilling_dist_scheduler.go
View File

@ -31,11 +31,11 @@ import (
"github.com/pingcap/tidb/pkg/config/kerneltype"
"github.com/pingcap/tidb/pkg/ddl/ingest"
"github.com/pingcap/tidb/pkg/ddl/logutil"
"github.com/pingcap/tidb/pkg/disttask/framework/dxfmetric"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/scheduler"
diststorage "github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/dxfmetric"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/scheduler"
diststorage "github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/lightning/backend/external"
"github.com/pingcap/tidb/pkg/lightning/backend/local"

6
pkg/ddl/backfilling_dist_scheduler_test.go
View File

@ -26,10 +26,10 @@ import (
"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/pkg/config/kerneltype"
"github.com/pingcap/tidb/pkg/ddl"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/scheduler"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/domain"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/scheduler"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/keyspace"
"github.com/pingcap/tidb/pkg/lightning/backend/external"
"github.com/pingcap/tidb/pkg/meta"

10
pkg/ddl/backfilling_import_cloud.go
View File

@ -23,11 +23,11 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/pkg/ddl/ingest"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/metering"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/metering"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/ingestor/engineapi"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/lightning/backend"

8
pkg/ddl/backfilling_merge_sort.go
View File

@ -26,10 +26,10 @@ import (
"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/br/pkg/storage"
"github.com/pingcap/tidb/pkg/ddl/ingest"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/ingestor/engineapi"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/lightning/backend/external"

8
pkg/ddl/backfilling_merge_temp.go
View File

@ -20,10 +20,10 @@ import (
"fmt"
"github.com/pingcap/errors"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/disttask/operator"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/dxf/operator"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/meta/model"
"github.com/pingcap/tidb/pkg/metrics"

6
pkg/ddl/backfilling_operators.go
View File

@ -33,9 +33,9 @@ import (
"github.com/pingcap/tidb/pkg/ddl/ingest"
"github.com/pingcap/tidb/pkg/ddl/session"
distsqlctx "github.com/pingcap/tidb/pkg/distsql/context"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/disttask/operator"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/dxf/operator"
"github.com/pingcap/tidb/pkg/ingestor/engineapi"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/lightning/backend/external"

12
pkg/ddl/backfilling_read_index.go
View File

@ -31,12 +31,12 @@ import (
"github.com/pingcap/tidb/pkg/ddl/ingest"
"github.com/pingcap/tidb/pkg/ddl/logutil"
sess "github.com/pingcap/tidb/pkg/ddl/session"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/metering"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/disttask/operator"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/metering"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/dxf/operator"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/lightning/backend/external"
"github.com/pingcap/tidb/pkg/lightning/backend/local"

6
pkg/ddl/ddl.go
View File

@ -42,10 +42,10 @@ import (
"github.com/pingcap/tidb/pkg/ddl/systable"
"github.com/pingcap/tidb/pkg/ddl/testargsv1"
"github.com/pingcap/tidb/pkg/ddl/util"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/scheduler"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/domain/infosync"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/scheduler"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/infoschema"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/meta"

4
pkg/ddl/export_test.go
View File

@ -24,8 +24,8 @@ import (
"github.com/pingcap/tidb/pkg/ddl/copr"
"github.com/pingcap/tidb/pkg/ddl/session"
"github.com/pingcap/tidb/pkg/ddl/testutil"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/disttask/operator"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/dxf/operator"
"github.com/pingcap/tidb/pkg/errctx"
"github.com/pingcap/tidb/pkg/expression"
"github.com/pingcap/tidb/pkg/kv"

8
pkg/ddl/index.go
View File

@ -42,11 +42,11 @@ import (
sess "github.com/pingcap/tidb/pkg/ddl/session"
"github.com/pingcap/tidb/pkg/ddl/systable"
ddlutil "github.com/pingcap/tidb/pkg/ddl/util"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/scheduler"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/domain/infosync"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/scheduler"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/errctx"
"github.com/pingcap/tidb/pkg/expression"
"github.com/pingcap/tidb/pkg/expression/exprstatic"

6
pkg/ddl/index_nokit_test.go
View File

@ -22,9 +22,9 @@ import (
"github.com/pingcap/errors"
ddlmock "github.com/pingcap/tidb/pkg/ddl/mock"
"github.com/pingcap/tidb/pkg/ddl/systable"
"github.com/pingcap/tidb/pkg/disttask/framework/mock"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/mock"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/meta/model"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"

4
pkg/ddl/reorg_util.go
View File

@ -24,8 +24,8 @@ import (
"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/pkg/config/kerneltype"
"github.com/pingcap/tidb/pkg/ddl/logutil"
dxfhandle "github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/scheduler"
dxfhandle "github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/scheduler"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/meta/model"
"github.com/pingcap/tidb/pkg/sessionctx"

2
pkg/ddl/testutil/BUILD.bazel
View File

@ -11,8 +11,8 @@ go_library(
deps = [
"//pkg/ddl",
"//pkg/ddl/logutil",
"//pkg/disttask/operator",
"//pkg/domain",
"//pkg/dxf/operator",
"//pkg/kv",
"//pkg/meta",
"//pkg/meta/model",

2
pkg/ddl/testutil/operator.go
View File

@ -15,7 +15,7 @@
package testutil
import (
"github.com/pingcap/tidb/pkg/disttask/operator"
"github.com/pingcap/tidb/pkg/dxf/operator"
"golang.org/x/sync/errgroup"
)

14
pkg/disttask/framework/mock/execute/BUILD.bazel
View File

@ -1,14 +0,0 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "execute",
srcs = ["execute_mock.go"],
importpath = "github.com/pingcap/tidb/pkg/disttask/framework/mock/execute",
visibility = ["//visibility:public"],
deps = [
"//pkg/disttask/framework/metering",
"//pkg/disttask/framework/proto",
"//pkg/disttask/framework/taskexecutor/execute",
"@org_uber_go_mock//gomock",
],
)

12
pkg/domain/BUILD.bazel
View File

@ -31,17 +31,17 @@ go_library(
"//pkg/ddl/schematracker",
"//pkg/ddl/systable",
"//pkg/ddl/util",
"//pkg/disttask/framework/handle",
"//pkg/disttask/framework/metering",
"//pkg/disttask/framework/proto",
"//pkg/disttask/framework/scheduler",
"//pkg/disttask/framework/storage",
"//pkg/disttask/framework/taskexecutor",
"//pkg/domain/crossks",
"//pkg/domain/globalconfigsync",
"//pkg/domain/infosync",
"//pkg/domain/metrics",
"//pkg/domain/sqlsvrapi",
"//pkg/dxf/framework/handle",
"//pkg/dxf/framework/metering",
"//pkg/dxf/framework/proto",
"//pkg/dxf/framework/scheduler",
"//pkg/dxf/framework/storage",
"//pkg/dxf/framework/taskexecutor",
"//pkg/errno",
"//pkg/infoschema",
"//pkg/infoschema/issyncer",

2
pkg/domain/crossks/BUILD.bazel
View File

@ -49,7 +49,7 @@ go_test(
deps = [
"//pkg/config",
"//pkg/config/kerneltype",
"//pkg/disttask/framework/storage",
"//pkg/dxf/framework/storage",
"//pkg/executor/importer",
"//pkg/infoschema",
"//pkg/keyspace",

2
pkg/domain/crossks/cross_ks_test.go
View File

@ -22,7 +22,7 @@ import (
"github.com/pingcap/kvproto/pkg/keyspacepb"
"github.com/pingcap/tidb/pkg/config"
"github.com/pingcap/tidb/pkg/config/kerneltype"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/executor/importer"
"github.com/pingcap/tidb/pkg/infoschema"
"github.com/pingcap/tidb/pkg/keyspace"

12
pkg/domain/domain.go
View File

@ -46,16 +46,16 @@ import (
"github.com/pingcap/tidb/pkg/ddl/schematracker"
"github.com/pingcap/tidb/pkg/ddl/systable"
ddlutil "github.com/pingcap/tidb/pkg/ddl/util"
disthandle "github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/metering"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/scheduler"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/domain/crossks"
"github.com/pingcap/tidb/pkg/domain/globalconfigsync"
"github.com/pingcap/tidb/pkg/domain/infosync"
"github.com/pingcap/tidb/pkg/domain/sqlsvrapi"
disthandle "github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/metering"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/scheduler"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/errno"
"github.com/pingcap/tidb/pkg/infoschema"
"github.com/pingcap/tidb/pkg/infoschema/issyncer"

0
pkg/disttask/OWNERS → pkg/dxf/OWNERS
View File

20
pkg/disttask/example/BUILD.bazel → pkg/dxf/example/BUILD.bazel
View File

@ -8,14 +8,14 @@ go_library(
"scheduler.go",
"task_executor.go",
],
importpath = "github.com/pingcap/tidb/pkg/disttask/example",
importpath = "github.com/pingcap/tidb/pkg/dxf/example",
visibility = ["//visibility:public"],
deps = [
"//pkg/disttask/framework/proto",
"//pkg/disttask/framework/scheduler",
"//pkg/disttask/framework/storage",
"//pkg/disttask/framework/taskexecutor",
"//pkg/disttask/framework/taskexecutor/execute",
"//pkg/dxf/framework/proto",
"//pkg/dxf/framework/scheduler",
"//pkg/dxf/framework/storage",
"//pkg/dxf/framework/taskexecutor",
"//pkg/dxf/framework/taskexecutor/execute",
"//pkg/util/logutil",
"@com_github_pingcap_errors//:errors",
"@org_uber_go_zap//:zap",
@ -29,10 +29,10 @@ go_test(
embed = [":example"],
flaky = True,
deps = [
"//pkg/disttask/framework/handle",
"//pkg/disttask/framework/proto",
"//pkg/disttask/framework/scheduler",
"//pkg/disttask/framework/taskexecutor",
"//pkg/dxf/framework/handle",
"//pkg/dxf/framework/proto",
"//pkg/dxf/framework/scheduler",
"//pkg/dxf/framework/taskexecutor",
"//pkg/testkit",
"@com_github_stretchr_testify//require",
"@com_github_tikv_client_go_v2//util",

8
pkg/disttask/example/app_test.go → pkg/dxf/example/app_test.go
View File

@ -19,10 +19,10 @@ import (
"encoding/json"
"testing"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/scheduler"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/scheduler"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/testkit"
"github.com/stretchr/testify/require"
"github.com/tikv/client-go/v2/util"

0
pkg/disttask/example/doc.go → pkg/dxf/example/doc.go
View File

0
pkg/disttask/example/proto.go → pkg/dxf/example/proto.go
View File

6
pkg/disttask/example/scheduler.go → pkg/dxf/example/scheduler.go
View File

@ -20,9 +20,9 @@ import (
"fmt"
"github.com/pingcap/errors"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/scheduler"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/scheduler"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/util/logutil"
"go.uber.org/zap"
)

6
pkg/disttask/example/task_executor.go → pkg/dxf/example/task_executor.go
View File

@ -18,9 +18,9 @@ import (
"context"
"encoding/json"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/util/logutil"
"go.uber.org/zap"
)

2
pkg/disttask/framework/BUILD.bazel → pkg/dxf/framework/BUILD.bazel
View File

@ -3,6 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "framework",
srcs = ["doc.go"],
importpath = "github.com/pingcap/tidb/pkg/disttask/framework",
importpath = "github.com/pingcap/tidb/pkg/dxf/framework",
visibility = ["//visibility:public"],
)

0
pkg/disttask/framework/doc.go → pkg/dxf/framework/doc.go
View File

4
pkg/disttask/framework/dxfmetric/BUILD.bazel → pkg/dxf/framework/dxfmetric/BUILD.bazel
View File

@ -6,10 +6,10 @@ go_library(
"collector.go",
"metric.go",
],
importpath = "github.com/pingcap/tidb/pkg/disttask/framework/dxfmetric",
importpath = "github.com/pingcap/tidb/pkg/dxf/framework/dxfmetric",
visibility = ["//visibility:public"],
deps = [
"//pkg/disttask/framework/proto",
"//pkg/dxf/framework/proto",
"//pkg/metrics/common",
"//pkg/util/intest",
"@com_github_google_uuid//:uuid",

2
pkg/disttask/framework/dxfmetric/collector.go → pkg/dxf/framework/dxfmetric/collector.go
View File

@ -20,7 +20,7 @@ import (
"time"
"github.com/google/uuid"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
metricscommon "github.com/pingcap/tidb/pkg/metrics/common"
"github.com/pingcap/tidb/pkg/util/intest"
"github.com/prometheus/client_golang/prometheus"

0
pkg/disttask/framework/dxfmetric/metric.go → pkg/dxf/framework/dxfmetric/metric.go
View File

16
pkg/disttask/framework/handle/BUILD.bazel → pkg/dxf/framework/handle/BUILD.bazel
View File

@ -6,17 +6,17 @@ go_library(
"handle.go",
"status.go",
],
importpath = "github.com/pingcap/tidb/pkg/disttask/framework/handle",
importpath = "github.com/pingcap/tidb/pkg/dxf/framework/handle",
visibility = ["//visibility:public"],
deps = [
"//br/pkg/storage",
"//br/pkg/storage/recording",
"//pkg/config/kerneltype",
"//pkg/disttask/framework/metering",
"//pkg/disttask/framework/proto",
"//pkg/disttask/framework/schstatus",
"//pkg/disttask/framework/storage",
"//pkg/domain/infosync",
"//pkg/dxf/framework/metering",
"//pkg/dxf/framework/proto",
"//pkg/dxf/framework/schstatus",
"//pkg/dxf/framework/storage",
"//pkg/kv",
"//pkg/lightning/log",
"//pkg/meta",
@ -51,9 +51,9 @@ go_test(
shard_count = 10,
deps = [
"//pkg/config/kerneltype",
"//pkg/disttask/framework/proto",
"//pkg/disttask/framework/schstatus",
"//pkg/disttask/framework/storage",
"//pkg/dxf/framework/proto",
"//pkg/dxf/framework/schstatus",
"//pkg/dxf/framework/storage",
"//pkg/kv",
"//pkg/meta",
"//pkg/sessionctx",

8
pkg/disttask/framework/handle/handle.go → pkg/dxf/framework/handle/handle.go
View File

@ -29,10 +29,10 @@ import (
extstorage "github.com/pingcap/tidb/br/pkg/storage"
"github.com/pingcap/tidb/br/pkg/storage/recording"
"github.com/pingcap/tidb/pkg/config/kerneltype"
"github.com/pingcap/tidb/pkg/disttask/framework/metering"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/schstatus"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/metering"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/schstatus"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/lightning/log"
"github.com/pingcap/tidb/pkg/meta"

6
pkg/disttask/framework/handle/handle_test.go → pkg/dxf/framework/handle/handle_test.go
View File

@ -26,9 +26,9 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/log"
"github.com/pingcap/tidb/pkg/config/kerneltype"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/sessionctx/vardef"
"github.com/pingcap/tidb/pkg/testkit"
"github.com/pingcap/tidb/pkg/testkit/testfailpoint"

6
pkg/disttask/framework/handle/status.go → pkg/dxf/framework/handle/status.go
View File

@ -20,10 +20,10 @@ import (
"time"
"github.com/pingcap/errors"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/schstatus"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/domain/infosync"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/schstatus"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/meta/tidbvar"
"github.com/pingcap/tidb/pkg/sessionctx"

2
pkg/disttask/framework/handle/status_test.go → pkg/dxf/framework/handle/status_test.go
View File

@ -18,7 +18,7 @@ import (
"fmt"
"testing"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/stretchr/testify/require"
)

8
pkg/disttask/framework/handle/status_testkit_test.go → pkg/dxf/framework/handle/status_testkit_test.go
View File

@ -22,10 +22,10 @@ import (
"time"
"github.com/ngaut/pools"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/schstatus"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/schstatus"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/meta"
"github.com/pingcap/tidb/pkg/sessionctx"

18
pkg/disttask/framework/integrationtests/BUILD.bazel → pkg/dxf/framework/integrationtests/BUILD.bazel
View File

@ -22,16 +22,16 @@ go_test(
"//pkg/config",
"//pkg/config/kerneltype",
"//pkg/ddl",
"//pkg/disttask/framework/handle",
"//pkg/disttask/framework/mock/execute",
"//pkg/disttask/framework/proto",
"//pkg/disttask/framework/scheduler",
"//pkg/disttask/framework/scheduler/mock",
"//pkg/disttask/framework/storage",
"//pkg/disttask/framework/taskexecutor",
"//pkg/disttask/framework/taskexecutor/execute",
"//pkg/disttask/framework/testutil",
"//pkg/domain",
"//pkg/dxf/framework/handle",
"//pkg/dxf/framework/mock/execute",
"//pkg/dxf/framework/proto",
"//pkg/dxf/framework/scheduler",
"//pkg/dxf/framework/scheduler/mock",
"//pkg/dxf/framework/storage",
"//pkg/dxf/framework/taskexecutor",
"//pkg/dxf/framework/taskexecutor/execute",
"//pkg/dxf/framework/testutil",
"//pkg/session",
"//pkg/sessionctx",
"//pkg/store/driver",

16
pkg/disttask/framework/integrationtests/bench_test.go → pkg/dxf/framework/integrationtests/bench_test.go
View File

@ -23,14 +23,14 @@ import (
"github.com/pingcap/tidb/pkg/config"
"github.com/pingcap/tidb/pkg/ddl"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/scheduler"
mockDispatch "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mock"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/disttask/framework/testutil"
"github.com/pingcap/tidb/pkg/domain"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/scheduler"
mockDispatch "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mock"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/dxf/framework/testutil"
"github.com/pingcap/tidb/pkg/session"
"github.com/pingcap/tidb/pkg/store/driver"
"github.com/pingcap/tidb/pkg/testkit"
@ -52,7 +52,7 @@ var (
// test overhead when starting multiple schedulers
//
// make failpoint-enable
// GOOS=linux GOARCH=amd64 go test -tags intest -c -o bench.test ./pkg/disttask/framework/integrationtests
// GOOS=linux GOARCH=amd64 go test -tags intest -c -o bench.test ./pkg/dxf/framework/integrationtests
// make failpoint-disable
//
// bench.test -test.v -run ^$ -test.bench=BenchmarkSchedulerOverhead --with-tikv "upstream-pd:2379?disableGC=true"

10
pkg/disttask/framework/integrationtests/framework_err_handling_test.go → pkg/dxf/framework/integrationtests/framework_err_handling_test.go
View File

@ -22,11 +22,11 @@ import (
"time"
"github.com/pingcap/errors"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/disttask/framework/testutil"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/dxf/framework/testutil"
"github.com/pingcap/tidb/pkg/testkit"
"github.com/stretchr/testify/require"
)

12
pkg/disttask/framework/integrationtests/framework_ha_test.go → pkg/dxf/framework/integrationtests/framework_ha_test.go
View File

@ -20,10 +20,10 @@ import (
"math"
"testing"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/disttask/framework/testutil"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/dxf/framework/testutil"
"github.com/pingcap/tidb/pkg/testkit/testfailpoint"
"github.com/pingcap/tidb/pkg/util"
"github.com/stretchr/testify/require"
@ -45,7 +45,7 @@ func TestHANodeRandomShutdown(t *testing.T) {
keepCount := int(math.Min(float64(c.NodeCount()-1), float64(c.Rand.Intn(10)+1)))
nodeNeedDown := c.GetRandNodeIDs(c.NodeCount() - keepCount)
t.Logf("started %d nodes, and we keep %d nodes, nodes that need shutdown: %v", c.NodeCount(), keepCount, nodeNeedDown)
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/mockTiDBShutdown",
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/mockTiDBShutdown",
func(e taskexecutor.TaskExecutor, execID string, _ *proto.TaskBase) {
if _, ok := nodeNeedDown[execID]; ok {
c.AsyncShutdown(execID)
@ -65,7 +65,7 @@ func TestHARandomShutdownInDifferentStep(t *testing.T) {
nodeNeedDownAtStepTwo := c.GetRandNodeIDs(c.NodeCount()/2 - 1)
t.Logf("started %d nodes, shutdown nodes at step 1: %v, shutdown nodes at step 2: %v",
c.NodeCount(), nodeNeedDownAtStepOne, nodeNeedDownAtStepTwo)
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/mockTiDBShutdown",
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/mockTiDBShutdown",
func(e taskexecutor.TaskExecutor, execID string, task *proto.TaskBase) {
var targetNodes map[string]struct{}
switch task.Step {

16
pkg/disttask/framework/integrationtests/framework_pause_and_resume_test.go → pkg/dxf/framework/integrationtests/framework_pause_and_resume_test.go
View File

@ -20,10 +20,10 @@ import (
"testing"
"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/disttask/framework/testutil"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/testutil"
"github.com/pingcap/tidb/pkg/testkit/testfailpoint"
"github.com/stretchr/testify/require"
)
@ -52,7 +52,7 @@ func TestFrameworkPauseAndResume(t *testing.T) {
registerExampleTask(t, c.MockCtrl, testutil.GetMockBasicSchedulerExt(c.MockCtrl), c.TestContext, nil)
// 1. schedule and pause one running task.
var counter atomic.Int32
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeRefreshTask", func(task *proto.Task) {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeRefreshTask", func(task *proto.Task) {
if counter.Add(1) <= 2 {
if task.State == proto.TaskStateRunning {
_, err := c.TaskMgr.PauseTask(c.Ctx, task.Key)
@ -63,7 +63,7 @@ func TestFrameworkPauseAndResume(t *testing.T) {
scope := handle.GetTargetScope()
task1 := testutil.SubmitAndWaitTask(c.Ctx, t, "key1", scope, 1)
require.Equal(t, proto.TaskStatePaused, task1.State)
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeRefreshTask"))
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeRefreshTask"))
// 4 subtask scheduled.
require.NoError(t, handle.ResumeTask(c.Ctx, "key1"))
task1Base := testutil.WaitTaskDone(c.Ctx, t, task1.Key)
@ -78,7 +78,7 @@ func TestFrameworkPauseAndResume(t *testing.T) {
// 2. pause pending task.
counter.Store(0)
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeRefreshTask", func(task *proto.Task) {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeRefreshTask", func(task *proto.Task) {
if counter.Add(1) <= 2 {
if task.State == proto.TaskStatePending {
_, err := mgr.PauseTask(c.Ctx, task.Key)
@ -88,7 +88,7 @@ func TestFrameworkPauseAndResume(t *testing.T) {
})
task2 := testutil.SubmitAndWaitTask(c.Ctx, t, "key2", scope, 1)
require.Equal(t, proto.TaskStatePaused, task2.State)
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeRefreshTask"))
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeRefreshTask"))
// 4 subtask scheduled.
require.NoError(t, handle.ResumeTask(c.Ctx, "key2"))
task2Base := testutil.WaitTaskDone(c.Ctx, t, task2.Key)

8
pkg/disttask/framework/integrationtests/framework_rollback_test.go → pkg/dxf/framework/integrationtests/framework_rollback_test.go
View File

@ -18,9 +18,9 @@ import (
"sync/atomic"
"testing"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/testutil"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/testutil"
"github.com/pingcap/tidb/pkg/testkit/testfailpoint"
"github.com/stretchr/testify/require"
)
@ -29,7 +29,7 @@ func TestFrameworkRollback(t *testing.T) {
c := testutil.NewTestDXFContext(t, 2, 16, true)
testutil.RegisterTaskTypeForRollback(t, c.MockCtrl, testutil.GetMockRollbackSchedulerExt(c.MockCtrl), c.TestContext)
var counter atomic.Int32
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/afterRefreshTask",
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/afterRefreshTask",
func(task *proto.Task) {
if counter.Add(1) <= 2 {
if task.State == proto.TaskStateRunning {

14
pkg/disttask/framework/integrationtests/framework_scope_test.go → pkg/dxf/framework/integrationtests/framework_scope_test.go
View File

@ -24,10 +24,10 @@ import (
"time"
"github.com/pingcap/tidb/pkg/config/kerneltype"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/scheduler"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/disttask/framework/testutil"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/scheduler"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/testutil"
"github.com/pingcap/tidb/pkg/testkit"
"github.com/pingcap/tidb/pkg/testkit/testfailpoint"
"github.com/stretchr/testify/require"
@ -90,7 +90,7 @@ func TestScopeBasic(t *testing.T) {
ch := make(chan struct{})
var counter atomic.Int32
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/syncRefresh", func() {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/syncRefresh", func() {
if counter.Add(1) == 1 {
ch <- struct{}{}
}
@ -108,7 +108,7 @@ func TestScopeBasic(t *testing.T) {
time.Sleep(5 * time.Second)
ch2 := make(chan struct{})
var counter2 atomic.Int32
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/syncRefresh", func() {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/syncRefresh", func() {
if counter2.Add(1) == 1 {
ch2 <- struct{}{}
}
@ -165,7 +165,7 @@ func runTargetScopeCase(t *testing.T, c *testutil.TestDXFContext, tk *testkit.Te
}
ch := make(chan struct{})
var counter atomic.Int32
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/syncRefresh", func() {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/syncRefresh", func() {
if counter.Add(1) <= 3 {
ch <- struct{}{}
}

40
pkg/disttask/framework/integrationtests/framework_test.go → pkg/dxf/framework/integrationtests/framework_test.go
View File

@ -25,14 +25,14 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/pkg/config/kerneltype"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
mockexecute "github.com/pingcap/tidb/pkg/disttask/framework/mock/execute"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/scheduler"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/disttask/framework/testutil"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
mockexecute "github.com/pingcap/tidb/pkg/dxf/framework/mock/execute"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/scheduler"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/dxf/framework/testutil"
"github.com/pingcap/tidb/pkg/testkit"
"github.com/pingcap/tidb/pkg/testkit/testfailpoint"
"github.com/pingcap/tidb/pkg/util"
@ -163,7 +163,7 @@ func TestFrameworkCancelTask(t *testing.T) {
registerExampleTask(t, c.MockCtrl, testutil.GetMockBasicSchedulerExt(c.MockCtrl), c.TestContext, nil)
var counter atomic.Int32
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/afterRunSubtask",
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/afterRunSubtask",
func(e taskexecutor.TaskExecutor, _ *error, _ context.Context) {
if counter.Add(1) == 1 {
require.NoError(t, c.TaskMgr.CancelTask(c.Ctx, e.GetTaskBase().ID))
@ -193,24 +193,24 @@ func TestOwnerChangeWhenSchedule(t *testing.T) {
c := testutil.NewTestDXFContext(t, 3, 16, true)
registerExampleTask(t, c.MockCtrl, testutil.GetMockBasicSchedulerExt(c.MockCtrl), c.TestContext, nil)
var counter atomic.Int32
require.NoError(t, failpoint.EnableCall("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mockOwnerChange", func() {
require.NoError(t, failpoint.EnableCall("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mockOwnerChange", func() {
if counter.Add(1) == 1 {
c.AsyncChangeOwner()
time.Sleep(time.Second)
}
}))
t.Cleanup(func() {
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mockOwnerChange"))
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mockOwnerChange"))
})
submitTaskAndCheckSuccessForBasic(c.Ctx, t, "😊", c.TestContext)
}
func TestGC(t *testing.T) {
ch := make(chan struct{})
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/storage/subtaskHistoryKeepSeconds", func(interval *int) {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/storage/subtaskHistoryKeepSeconds", func(interval *int) {
*interval = 1
})
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/historySubtaskTableGcInterval", func(interval *time.Duration) {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/historySubtaskTableGcInterval", func(interval *time.Duration) {
*interval = 1 * time.Second
<-ch
})
@ -249,7 +249,7 @@ func TestFrameworkRunSubtaskCancelOrFailed(t *testing.T) {
registerExampleTask(t, c.MockCtrl, testutil.GetMockBasicSchedulerExt(c.MockCtrl), c.TestContext, nil)
t.Run("meet cancel on run subtask", func(t *testing.T) {
var counter atomic.Int32
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/afterRunSubtask",
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/afterRunSubtask",
func(e taskexecutor.TaskExecutor, errP *error, _ context.Context) {
if counter.Add(1) == 1 {
e.CancelRunningSubtask()
@ -263,7 +263,7 @@ func TestFrameworkRunSubtaskCancelOrFailed(t *testing.T) {
t.Run("meet some error on run subtask", func(t *testing.T) {
var counter atomic.Int32
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/afterRunSubtask",
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/afterRunSubtask",
func(_ taskexecutor.TaskExecutor, errP *error, _ context.Context) {
if counter.Add(1) == 1 {
*errP = errors.New("MockExecutorRunErr")
@ -284,7 +284,7 @@ func TestFrameworkCleanUpRoutine(t *testing.T) {
c := testutil.NewTestDXFContext(t, 3, 16, true)
registerExampleTask(t, c.MockCtrl, testutil.GetMockBasicSchedulerExt(c.MockCtrl), c.TestContext, nil)
ch := make(chan struct{}, 1)
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/WaitCleanUpFinished", func() {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/WaitCleanUpFinished", func() {
ch <- struct{}{}
})
@ -301,7 +301,7 @@ func TestFrameworkCleanUpRoutine(t *testing.T) {
require.NotEmpty(t, subtasks)
// transfer err
testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mockTransferErr", "1*return()")
testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mockTransferErr", "1*return()")
submitTaskAndCheckSuccessForBasic(c.Ctx, t, "key2", c.TestContext)
<-ch
mgr, err = storage.GetTaskManager()
@ -319,7 +319,7 @@ func TestTaskCancelledBeforeUpdateTask(t *testing.T) {
registerExampleTask(t, c.MockCtrl, testutil.GetMockBasicSchedulerExt(c.MockCtrl), c.TestContext, nil)
var counter atomic.Int32
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/cancelBeforeUpdateTask", func(taskID int64) {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/cancelBeforeUpdateTask", func(taskID int64) {
if counter.Add(1) == 1 {
require.NoError(t, c.TaskMgr.CancelTask(c.Ctx, taskID))
}
@ -346,7 +346,7 @@ func TestMaxRuntimeSlots(t *testing.T) {
registerExampleTask(t, c.MockCtrl, testutil.GetMockBasicSchedulerExt(c.MockCtrl), c.TestContext, nil)
var callCount atomic.Int32
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/beforeSetFrameworkInfo", func(rc *proto.StepResource) {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/beforeSetFrameworkInfo", func(rc *proto.StepResource) {
val := callCount.Add(1)
if val == 1 {
require.Equal(t, 12, int(rc.CPU.Capacity()))
@ -354,7 +354,7 @@ func TestMaxRuntimeSlots(t *testing.T) {
require.Equal(t, 16, int(rc.CPU.Capacity()))
}
})
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/storage/beforeSubmitTask",
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/storage/beforeSubmitTask",
func(requiredSlots *int, params *proto.ExtraParams) {
params.MaxRuntimeSlots = 12
params.TargetSteps = []proto.Step{proto.StepOne}

0
pkg/disttask/framework/integrationtests/main_test.go → pkg/dxf/framework/integrationtests/main_test.go
View File

28
pkg/disttask/framework/integrationtests/modify_test.go → pkg/dxf/framework/integrationtests/modify_test.go
View File

@ -21,11 +21,11 @@ import (
"testing"
"time"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
mockexecute "github.com/pingcap/tidb/pkg/disttask/framework/mock/execute"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/disttask/framework/testutil"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
mockexecute "github.com/pingcap/tidb/pkg/dxf/framework/mock/execute"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/dxf/framework/testutil"
"github.com/pingcap/tidb/pkg/sessionctx"
"github.com/pingcap/tidb/pkg/testkit/testfailpoint"
"github.com/pingcap/tidb/pkg/util/sqlexec"
@ -119,7 +119,7 @@ func TestModifyTaskConcurrencyAndMeta(t *testing.T) {
var once sync.Once
modifySyncCh := make(chan struct{})
var theTask *proto.Task
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeGetSchedulableTasks", func() {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeGetSchedulableTasks", func() {
once.Do(func() {
task, err := handle.SubmitTask(c.Ctx, "k1", proto.TaskTypeExample, c.Store.GetKeyspace(), 3, scope, 0, []byte("init"))
require.NoError(t, err)
@ -158,7 +158,7 @@ func TestModifyTaskConcurrencyAndMeta(t *testing.T) {
defer resetRuntimeInfoFn()
var once sync.Once
modifySyncCh := make(chan struct{})
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeRefreshTask", func(task *proto.Task) {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeRefreshTask", func(task *proto.Task) {
if task.State != proto.TaskStateRunning && task.Step != proto.StepTwo {
return
}
@ -203,7 +203,7 @@ func TestModifyTaskConcurrencyAndMeta(t *testing.T) {
t.Run("modify running task concurrency at second subtask of step two", func(t *testing.T) {
defer resetRuntimeInfoFn()
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/beforeGetTaskByIDInRun",
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/beforeGetTaskByIDInRun",
func(taskID int64) {
if len(runtimeInfo.subtaskInfos) == 3 {
require.NoError(t, c.TaskMgr.ModifyTaskByID(c.Ctx, taskID, &proto.ModifyParam{
@ -243,7 +243,7 @@ func TestModifyTaskConcurrencyAndMeta(t *testing.T) {
var once sync.Once
syncCh := make(chan struct{})
var theTask *proto.Task
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeGetSchedulableTasks", func() {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeGetSchedulableTasks", func() {
once.Do(func() {
task, err := handle.SubmitTask(c.Ctx, "k3", proto.TaskTypeExample, c.Store.GetKeyspace(), 3, scope, 0, nil)
require.NoError(t, err)
@ -289,7 +289,7 @@ func TestModifyTaskConcurrencyAndMeta(t *testing.T) {
var once sync.Once
modifySyncCh := make(chan struct{})
var theTask *proto.Task
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeGetSchedulableTasks", func() {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeGetSchedulableTasks", func() {
once.Do(func() {
task, err := handle.SubmitTask(c.Ctx, "k4", proto.TaskTypeExample, c.Store.GetKeyspace(), 3, scope, 0, nil)
require.NoError(t, err)
@ -308,7 +308,7 @@ func TestModifyTaskConcurrencyAndMeta(t *testing.T) {
})
})
var onceForRefresh sync.Once
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/afterRefreshTask",
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/afterRefreshTask",
func(task *proto.Task) {
onceForRefresh.Do(func() {
require.Equal(t, proto.TaskStateModifying, task.State)
@ -343,7 +343,7 @@ func TestModifyTaskConcurrencyAndMeta(t *testing.T) {
var once sync.Once
modifySyncCh := make(chan struct{})
var theTask *proto.Task
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeGetSchedulableTasks", func() {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeGetSchedulableTasks", func() {
once.Do(func() {
task, err := handle.SubmitTask(c.Ctx, "k5", proto.TaskTypeExample, c.Store.GetKeyspace(), 3, scope, 0, []byte("init"))
require.NoError(t, err)
@ -441,7 +441,7 @@ func TestModifyTaskConcurrencyAndMeta(t *testing.T) {
defer resetRuntimeInfoFn()
var once sync.Once
modifySyncCh := make(chan struct{})
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeRefreshTask", func(task *proto.Task) {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeRefreshTask", func(task *proto.Task) {
if task.State != proto.TaskStateRunning && task.Step != proto.StepOne {
return
}
@ -489,7 +489,7 @@ func TestModifyTaskMaxNodeCountForSubtaskBalance(t *testing.T) {
defer resetRuntimeInfoFn()
var once sync.Once
modifySyncCh := make(chan struct{})
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeRefreshTask", func(task *proto.Task) {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeRefreshTask", func(task *proto.Task) {
if task.State != proto.TaskStateRunning && task.Step != proto.StepOne {
return
}

10
pkg/disttask/framework/integrationtests/resource_control_test.go → pkg/dxf/framework/integrationtests/resource_control_test.go
View File

@ -23,11 +23,11 @@ import (
"testing"
"time"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
mockDispatch "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mock"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/disttask/framework/testutil"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
mockDispatch "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mock"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/testutil"
"github.com/pingcap/tidb/pkg/util"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"

8
pkg/disttask/framework/metering/BUILD.bazel → pkg/dxf/framework/metering/BUILD.bazel
View File

@ -7,13 +7,13 @@ go_library(
"metering.go",
"recorder.go",
],
importpath = "github.com/pingcap/tidb/pkg/disttask/framework/metering",
importpath = "github.com/pingcap/tidb/pkg/dxf/framework/metering",
visibility = ["//visibility:public"],
deps = [
"//br/pkg/storage/recording",
"//pkg/config/kerneltype",
"//pkg/disttask/framework/dxfmetric",
"//pkg/disttask/framework/proto",
"//pkg/dxf/framework/dxfmetric",
"//pkg/dxf/framework/proto",
"//pkg/util",
"//pkg/util/logutil",
"@com_github_docker_go_units//:go-units",
@ -42,7 +42,7 @@ go_test(
shard_count = 12,
deps = [
"//pkg/config/kerneltype",
"//pkg/disttask/framework/proto",
"//pkg/dxf/framework/proto",
"//pkg/util",
"@com_github_pingcap_metering_sdk//common",
"@com_github_pingcap_metering_sdk//config",

0
pkg/disttask/framework/metering/data.go → pkg/dxf/framework/metering/data.go
View File

0
pkg/disttask/framework/metering/data_test.go → pkg/dxf/framework/metering/data_test.go
View File

4
pkg/disttask/framework/metering/metering.go → pkg/dxf/framework/metering/metering.go
View File

@ -31,8 +31,8 @@ import (
meteringwriterapi "github.com/pingcap/metering_sdk/writer"
meteringwriter "github.com/pingcap/metering_sdk/writer/metering"
"github.com/pingcap/tidb/pkg/config/kerneltype"
"github.com/pingcap/tidb/pkg/disttask/framework/dxfmetric"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/dxfmetric"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/util"
"github.com/pingcap/tidb/pkg/util/logutil"
"go.uber.org/zap"

2
pkg/disttask/framework/metering/metering_test.go → pkg/dxf/framework/metering/metering_test.go
View File

@ -29,7 +29,7 @@ import (
meteringwriter "github.com/pingcap/metering_sdk/writer/metering"
writermock "github.com/pingcap/metering_sdk/writer/mock"
"github.com/pingcap/tidb/pkg/config/kerneltype"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/util"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"

0
pkg/disttask/framework/metering/recorder.go → pkg/dxf/framework/metering/recorder.go
View File

0
pkg/disttask/framework/metering/recorder_test.go → pkg/dxf/framework/metering/recorder_test.go
View File

10
pkg/disttask/framework/mock/BUILD.bazel → pkg/dxf/framework/mock/BUILD.bazel
View File

@ -8,13 +8,13 @@ go_library(
"storage_manager_mock.go",
"task_executor_mock.go",
],
importpath = "github.com/pingcap/tidb/pkg/disttask/framework/mock",
importpath = "github.com/pingcap/tidb/pkg/dxf/framework/mock",
visibility = ["//visibility:public"],
deps = [
"//pkg/disttask/framework/planner",
"//pkg/disttask/framework/proto",
"//pkg/disttask/framework/storage",
"//pkg/disttask/framework/taskexecutor/execute",
"//pkg/dxf/framework/planner",
"//pkg/dxf/framework/proto",
"//pkg/dxf/framework/storage",
"//pkg/dxf/framework/taskexecutor/execute",
"//pkg/sessionctx",
"@org_uber_go_mock//gomock",
],

14
pkg/dxf/framework/mock/execute/BUILD.bazel Normal file
View File

@ -0,0 +1,14 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "execute",
srcs = ["execute_mock.go"],
importpath = "github.com/pingcap/tidb/pkg/dxf/framework/mock/execute",
visibility = ["//visibility:public"],
deps = [
"//pkg/dxf/framework/metering",
"//pkg/dxf/framework/proto",
"//pkg/dxf/framework/taskexecutor/execute",
"@org_uber_go_mock//gomock",
],
)

10
pkg/disttask/framework/mock/execute/execute_mock.go → pkg/dxf/framework/mock/execute/execute_mock.go
View File

@ -1,9 +1,9 @@
// Code generated by MockGen. DO NOT EDIT.
// Source: github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute (interfaces: StepExecutor)
// Source: github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute (interfaces: StepExecutor)
//
// Generated by this command:
//
// mockgen -embed -package mockexecute github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute StepExecutor
// mockgen -embed -package mockexecute github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute StepExecutor
//
// Package mockexecute is a generated GoMock package.
@ -13,9 +13,9 @@ import (
context "context"
reflect "reflect"
metering "github.com/pingcap/tidb/pkg/disttask/framework/metering"
proto "github.com/pingcap/tidb/pkg/disttask/framework/proto"
execute "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
metering "github.com/pingcap/tidb/pkg/dxf/framework/metering"
proto "github.com/pingcap/tidb/pkg/dxf/framework/proto"
execute "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
gomock "go.uber.org/mock/gomock"
)

8
pkg/disttask/framework/mock/plan_mock.go → pkg/dxf/framework/mock/plan_mock.go
View File

@ -1,9 +1,9 @@
// Code generated by MockGen. DO NOT EDIT.
// Source: github.com/pingcap/tidb/pkg/disttask/framework/planner (interfaces: LogicalPlan,PipelineSpec)
// Source: github.com/pingcap/tidb/pkg/dxf/framework/planner (interfaces: LogicalPlan,PipelineSpec)
//
// Generated by this command:
//
// mockgen -package mock github.com/pingcap/tidb/pkg/disttask/framework/planner LogicalPlan,PipelineSpec
// mockgen -package mock github.com/pingcap/tidb/pkg/dxf/framework/planner LogicalPlan,PipelineSpec
//
// Package mock is a generated GoMock package.
@ -12,8 +12,8 @@ package mock
import (
reflect "reflect"
planner "github.com/pingcap/tidb/pkg/disttask/framework/planner"
proto "github.com/pingcap/tidb/pkg/disttask/framework/proto"
planner "github.com/pingcap/tidb/pkg/dxf/framework/planner"
proto "github.com/pingcap/tidb/pkg/dxf/framework/proto"
gomock "go.uber.org/mock/gomock"
)

10
pkg/disttask/framework/mock/scheduler_mock.go → pkg/dxf/framework/mock/scheduler_mock.go
View File

@ -1,9 +1,9 @@
// Code generated by MockGen. DO NOT EDIT.
// Source: github.com/pingcap/tidb/pkg/disttask/framework/scheduler (interfaces: Scheduler,CleanUpRoutine,TaskManager)
// Source: github.com/pingcap/tidb/pkg/dxf/framework/scheduler (interfaces: Scheduler,CleanUpRoutine,TaskManager)
//
// Generated by this command:
//
// mockgen -package mock github.com/pingcap/tidb/pkg/disttask/framework/scheduler Scheduler,CleanUpRoutine,TaskManager
// mockgen -package mock github.com/pingcap/tidb/pkg/dxf/framework/scheduler Scheduler,CleanUpRoutine,TaskManager
//
// Package mock is a generated GoMock package.
@ -13,9 +13,9 @@ import (
context "context"
reflect "reflect"
proto "github.com/pingcap/tidb/pkg/disttask/framework/proto"
storage "github.com/pingcap/tidb/pkg/disttask/framework/storage"
execute "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
proto "github.com/pingcap/tidb/pkg/dxf/framework/proto"
storage "github.com/pingcap/tidb/pkg/dxf/framework/storage"
execute "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
sessionctx "github.com/pingcap/tidb/pkg/sessionctx"
gomock "go.uber.org/mock/gomock"
)

6
pkg/disttask/framework/mock/storage_manager_mock.go → pkg/dxf/framework/mock/storage_manager_mock.go
View File

@ -1,9 +1,9 @@
// Code generated by MockGen. DO NOT EDIT.
// Source: github.com/pingcap/tidb/pkg/disttask/framework/storage (interfaces: Manager)
// Source: github.com/pingcap/tidb/pkg/dxf/framework/storage (interfaces: Manager)
//
// Generated by this command:
//
// mockgen -package mock github.com/pingcap/tidb/pkg/disttask/framework/storage Manager
// mockgen -package mock github.com/pingcap/tidb/pkg/dxf/framework/storage Manager
//
// Package mock is a generated GoMock package.
@ -13,7 +13,7 @@ import (
context "context"
reflect "reflect"
proto "github.com/pingcap/tidb/pkg/disttask/framework/proto"
proto "github.com/pingcap/tidb/pkg/dxf/framework/proto"
gomock "go.uber.org/mock/gomock"
)

10
pkg/disttask/framework/mock/task_executor_mock.go → pkg/dxf/framework/mock/task_executor_mock.go
View File

@ -1,9 +1,9 @@
// Code generated by MockGen. DO NOT EDIT.
// Source: github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor (interfaces: TaskTable,TaskExecutor,Extension)
// Source: github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor (interfaces: TaskTable,TaskExecutor,Extension)
//
// Generated by this command:
//
// mockgen -package mock github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor TaskTable,TaskExecutor,Extension
// mockgen -package mock github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor TaskTable,TaskExecutor,Extension
//
// Package mock is a generated GoMock package.
@ -13,9 +13,9 @@ import (
context "context"
reflect "reflect"
proto "github.com/pingcap/tidb/pkg/disttask/framework/proto"
storage "github.com/pingcap/tidb/pkg/disttask/framework/storage"
execute "github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
proto "github.com/pingcap/tidb/pkg/dxf/framework/proto"
storage "github.com/pingcap/tidb/pkg/dxf/framework/storage"
execute "github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
sessionctx "github.com/pingcap/tidb/pkg/sessionctx"
gomock "go.uber.org/mock/gomock"
)

14
pkg/disttask/framework/planner/BUILD.bazel → pkg/dxf/framework/planner/BUILD.bazel
View File

@ -6,12 +6,12 @@ go_library(
"plan.go",
"planner.go",
],
importpath = "github.com/pingcap/tidb/pkg/disttask/framework/planner",
importpath = "github.com/pingcap/tidb/pkg/dxf/framework/planner",
visibility = ["//visibility:public"],
deps = [
"//pkg/disttask/framework/handle",
"//pkg/disttask/framework/proto",
"//pkg/disttask/framework/storage",
"//pkg/dxf/framework/handle",
"//pkg/dxf/framework/proto",
"//pkg/dxf/framework/storage",
"//pkg/kv",
"//pkg/sessionctx",
],
@ -28,9 +28,9 @@ go_test(
shard_count = 2,
deps = [
":planner",
"//pkg/disttask/framework/mock",
"//pkg/disttask/framework/proto",
"//pkg/disttask/framework/storage",
"//pkg/dxf/framework/mock",
"//pkg/dxf/framework/proto",
"//pkg/dxf/framework/storage",
"//pkg/kv",
"//pkg/testkit",
"@com_github_ngaut_pools//:pools",

2
pkg/disttask/framework/planner/plan.go → pkg/dxf/framework/planner/plan.go
View File

@ -17,7 +17,7 @@ package planner
import (
"context"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/sessionctx"
)

4
pkg/disttask/framework/planner/plan_test.go → pkg/dxf/framework/planner/plan_test.go
View File

@ -17,8 +17,8 @@ package planner_test
import (
"testing"
"github.com/pingcap/tidb/pkg/disttask/framework/mock"
"github.com/pingcap/tidb/pkg/disttask/framework/planner"
"github.com/pingcap/tidb/pkg/dxf/framework/mock"
"github.com/pingcap/tidb/pkg/dxf/framework/planner"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
)

4
pkg/disttask/framework/planner/planner.go → pkg/dxf/framework/planner/planner.go
View File

@ -15,8 +15,8 @@
package planner
import (
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
)
// Planner represents a distribute plan planner.

8
pkg/disttask/framework/planner/planner_test.go → pkg/dxf/framework/planner/planner_test.go
View File

@ -20,10 +20,10 @@ import (
"time"
"github.com/ngaut/pools"
"github.com/pingcap/tidb/pkg/disttask/framework/mock"
"github.com/pingcap/tidb/pkg/disttask/framework/planner"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/mock"
"github.com/pingcap/tidb/pkg/dxf/framework/planner"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/testkit"
"github.com/stretchr/testify/require"

2
pkg/disttask/framework/proto/BUILD.bazel → pkg/dxf/framework/proto/BUILD.bazel
View File

@ -10,7 +10,7 @@ go_library(
"task.go",
"type.go",
],
importpath = "github.com/pingcap/tidb/pkg/disttask/framework/proto",
importpath = "github.com/pingcap/tidb/pkg/dxf/framework/proto",
visibility = ["//visibility:public"],
deps = ["@com_github_docker_go_units//:go-units"],
)

0
pkg/disttask/framework/proto/modify.go → pkg/dxf/framework/proto/modify.go
View File

0
pkg/disttask/framework/proto/node.go → pkg/dxf/framework/proto/node.go
View File

0
pkg/disttask/framework/proto/step.go → pkg/dxf/framework/proto/step.go
View File

0
pkg/disttask/framework/proto/step_test.go → pkg/dxf/framework/proto/step_test.go
View File

0
pkg/disttask/framework/proto/subtask.go → pkg/dxf/framework/proto/subtask.go
View File

0
pkg/disttask/framework/proto/subtask_test.go → pkg/dxf/framework/proto/subtask_test.go
View File

0
pkg/disttask/framework/proto/task.go → pkg/dxf/framework/proto/task.go
View File

0
pkg/disttask/framework/proto/task_test.go → pkg/dxf/framework/proto/task_test.go
View File

0
pkg/disttask/framework/proto/type.go → pkg/dxf/framework/proto/type.go
View File

0
pkg/disttask/framework/proto/type_test.go → pkg/dxf/framework/proto/type_test.go
View File

30
pkg/disttask/framework/scheduler/BUILD.bazel → pkg/dxf/framework/scheduler/BUILD.bazel
View File

@ -12,18 +12,18 @@ go_library(
"slots.go",
"state_transform.go",
],
importpath = "github.com/pingcap/tidb/pkg/disttask/framework/scheduler",
importpath = "github.com/pingcap/tidb/pkg/dxf/framework/scheduler",
visibility = ["//visibility:public"],
deps = [
"//pkg/config/kerneltype",
"//pkg/disttask/framework/dxfmetric",
"//pkg/disttask/framework/handle",
"//pkg/disttask/framework/proto",
"//pkg/disttask/framework/schstatus",
"//pkg/disttask/framework/storage",
"//pkg/disttask/framework/taskexecutor/execute",
"//pkg/domain/infosync",
"//pkg/domain/serverinfo",
"//pkg/dxf/framework/dxfmetric",
"//pkg/dxf/framework/handle",
"//pkg/dxf/framework/proto",
"//pkg/dxf/framework/schstatus",
"//pkg/dxf/framework/storage",
"//pkg/dxf/framework/taskexecutor/execute",
"//pkg/kv",
"//pkg/lightning/log",
"//pkg/metrics",
@ -68,15 +68,15 @@ go_test(
deps = [
"//pkg/config",
"//pkg/config/kerneltype",
"//pkg/disttask/framework/dxfmetric",
"//pkg/disttask/framework/handle",
"//pkg/disttask/framework/mock",
"//pkg/disttask/framework/proto",
"//pkg/disttask/framework/scheduler/mock",
"//pkg/disttask/framework/schstatus",
"//pkg/disttask/framework/storage",
"//pkg/disttask/framework/testutil",
"//pkg/domain/infosync",
"//pkg/dxf/framework/dxfmetric",
"//pkg/dxf/framework/handle",
"//pkg/dxf/framework/mock",
"//pkg/dxf/framework/proto",
"//pkg/dxf/framework/scheduler/mock",
"//pkg/dxf/framework/schstatus",
"//pkg/dxf/framework/storage",
"//pkg/dxf/framework/testutil",
"//pkg/keyspace",
"//pkg/kv",
"//pkg/sessionctx",

6
pkg/disttask/framework/scheduler/autoscaler.go → pkg/dxf/framework/scheduler/autoscaler.go
View File

@ -21,9 +21,9 @@ import (
"github.com/docker/go-units"
"github.com/pingcap/errors"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/schstatus"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/schstatus"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/sessionctx/vardef"
"github.com/pingcap/tidb/pkg/util/cpu"

2
pkg/disttask/framework/scheduler/autoscaler_test.go → pkg/dxf/framework/scheduler/autoscaler_test.go
View File

@ -19,7 +19,7 @@ import (
"testing"
"github.com/docker/go-units"
"github.com/pingcap/tidb/pkg/disttask/framework/schstatus"
"github.com/pingcap/tidb/pkg/dxf/framework/schstatus"
"github.com/stretchr/testify/require"
)

2
pkg/disttask/framework/scheduler/balancer.go → pkg/dxf/framework/scheduler/balancer.go
View File

@ -21,7 +21,7 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
llog "github.com/pingcap/tidb/pkg/lightning/log"
"github.com/pingcap/tidb/pkg/util/intest"
"github.com/pingcap/tidb/pkg/util/logutil"

4
pkg/disttask/framework/scheduler/balancer_test.go → pkg/dxf/framework/scheduler/balancer_test.go
View File

@ -20,8 +20,8 @@ import (
"testing"
"github.com/pingcap/errors"
"github.com/pingcap/tidb/pkg/disttask/framework/mock"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/mock"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"

6
pkg/disttask/framework/scheduler/interface.go → pkg/dxf/framework/scheduler/interface.go
View File

@ -17,9 +17,9 @@ package scheduler
import (
"context"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/sessionctx"
"github.com/pingcap/tidb/pkg/util/syncutil"

0
pkg/disttask/framework/scheduler/main_test.go → pkg/dxf/framework/scheduler/main_test.go
View File

6
pkg/disttask/framework/scheduler/mock/BUILD.bazel → pkg/dxf/framework/scheduler/mock/BUILD.bazel
View File

@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "mock",
srcs = ["scheduler_mock.go"],
importpath = "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mock",
importpath = "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mock",
visibility = ["//visibility:public"],
deps = [
"//pkg/disttask/framework/proto",
"//pkg/disttask/framework/storage",
"//pkg/dxf/framework/proto",
"//pkg/dxf/framework/storage",
"@org_uber_go_mock//gomock",
],
)

8
pkg/disttask/framework/scheduler/mock/scheduler_mock.go → pkg/dxf/framework/scheduler/mock/scheduler_mock.go
View File

@ -1,9 +1,9 @@
// Code generated by MockGen. DO NOT EDIT.
// Source: github.com/pingcap/tidb/pkg/disttask/framework/scheduler (interfaces: Extension)
// Source: github.com/pingcap/tidb/pkg/dxf/framework/scheduler (interfaces: Extension)
//
// Generated by this command:
//
// mockgen -destination pkg/disttask/framework/scheduler/mock/scheduler_mock.go -package mock github.com/pingcap/tidb/pkg/disttask/framework/scheduler Extension
// mockgen -destination pkg/dxf/framework/scheduler/mock/scheduler_mock.go -package mock github.com/pingcap/tidb/pkg/dxf/framework/scheduler Extension
//
// Package mock is a generated GoMock package.
@ -13,8 +13,8 @@ import (
context "context"
reflect "reflect"
proto "github.com/pingcap/tidb/pkg/disttask/framework/proto"
storage "github.com/pingcap/tidb/pkg/disttask/framework/storage"
proto "github.com/pingcap/tidb/pkg/dxf/framework/proto"
storage "github.com/pingcap/tidb/pkg/dxf/framework/storage"
gomock "go.uber.org/mock/gomock"
)

2
pkg/disttask/framework/scheduler/nodes.go → pkg/dxf/framework/scheduler/nodes.go
View File

@ -21,7 +21,7 @@ import (
"time"
"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
llog "github.com/pingcap/tidb/pkg/lightning/log"
"github.com/pingcap/tidb/pkg/util/intest"
"github.com/pingcap/tidb/pkg/util/logutil"

8
pkg/disttask/framework/scheduler/nodes_test.go → pkg/dxf/framework/scheduler/nodes_test.go
View File

@ -21,8 +21,8 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/pkg/disttask/framework/mock"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/mock"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/util/cpu"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
@ -33,9 +33,9 @@ func TestMaintainLiveNodes(t *testing.T) {
defer ctrl.Finish()
mockTaskMgr := mock.NewMockTaskManager(ctrl)
require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mockTaskExecutorNodes", "return()"))
require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mockTaskExecutorNodes", "return()"))
t.Cleanup(func() {
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mockTaskExecutorNodes"))
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mockTaskExecutorNodes"))
})
MockServerInfo.Store(&[]string{":4000"})

10
pkg/disttask/framework/scheduler/scheduler.go → pkg/dxf/framework/scheduler/scheduler.go
View File

@ -25,13 +25,13 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/pkg/disttask/framework/dxfmetric"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/disttask/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/domain/infosync"
"github.com/pingcap/tidb/pkg/domain/serverinfo"
"github.com/pingcap/tidb/pkg/dxf/framework/dxfmetric"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/taskexecutor/execute"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/sessionctx"
"github.com/pingcap/tidb/pkg/util/backoff"

8
pkg/disttask/framework/scheduler/scheduler_manager.go → pkg/dxf/framework/scheduler/scheduler_manager.go
View File

@ -22,10 +22,10 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/pkg/config/kerneltype"
"github.com/pingcap/tidb/pkg/disttask/framework/dxfmetric"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/dxfmetric"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/metrics"
"github.com/pingcap/tidb/pkg/sessionctx"

14
pkg/disttask/framework/scheduler/scheduler_manager_nokit_test.go → pkg/dxf/framework/scheduler/scheduler_manager_nokit_test.go
View File

@ -22,10 +22,10 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/pkg/disttask/framework/mock"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
mockScheduler "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/mock"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/dxf/framework/mock"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
mockScheduler "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/mock"
"github.com/pingcap/tidb/pkg/dxf/framework/storage"
"github.com/pingcap/tidb/pkg/kv"
"github.com/pingcap/tidb/pkg/testkit/testfailpoint"
"github.com/stretchr/testify/require"
@ -151,7 +151,7 @@ func TestSchedulerCleanupTask(t *testing.T) {
func TestManagerSchedulerNotAllocateSlots(t *testing.T) {
// the tests make sure allocatedSlots correct.
require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/exitScheduler", "return()"))
require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/exitScheduler", "return()"))
ctrl := gomock.NewController(t)
defer ctrl.Finish()
@ -197,7 +197,7 @@ func TestManagerSchedulerNotAllocateSlots(t *testing.T) {
<-mgr.finishCh
}
mgr.schedulerWG.Wait()
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/framework/scheduler/exitScheduler"))
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/dxf/framework/scheduler/exitScheduler"))
}
func TestFastRespondNoNeedResourceTaskWhenSchedulersReachLimit(t *testing.T) {
@ -228,7 +228,7 @@ func TestFastRespondNoNeedResourceTaskWhenSchedulersReachLimit(t *testing.T) {
} {
t.Run(state.String(), func(t *testing.T) {
ch := make(chan struct{})
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/disttask/framework/scheduler/beforeRefreshTask", func(task *proto.Task) {
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/dxf/framework/scheduler/beforeRefreshTask", func(task *proto.Task) {
if task.ID == 1 {
<-ch
}

8
pkg/disttask/framework/scheduler/scheduler_manager_test.go → pkg/dxf/framework/scheduler/scheduler_manager_test.go
View File

@ -20,10 +20,10 @@ import (
"time"
"github.com/ngaut/pools"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/mock"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/testutil"
"github.com/pingcap/tidb/pkg/dxf/framework/handle"
"github.com/pingcap/tidb/pkg/dxf/framework/mock"
"github.com/pingcap/tidb/pkg/dxf/framework/proto"
"github.com/pingcap/tidb/pkg/dxf/framework/testutil"
"github.com/pingcap/tidb/pkg/testkit"
"github.com/pingcap/tidb/pkg/testkit/testfailpoint"
"github.com/stretchr/testify/require"

Some files were not shown because too many files have changed in this diff Show More