Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ddl: sync schema version using watch, notify sessions on owner node by job id #53217

Merged
merged 14 commits into from
May 17, 2024
Merged

ddl: sync schema version using watch, notify sessions on owner node by job id #53217

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8685798
change
D3Hunter May 13, 2024
817c4d6
time
D3Hunter Apr 25, 2024
1de5d27
change
D3Hunter May 13, 2024
0efbfd1
opt notify job, ut
D3Hunter May 13, 2024
970bbf4
change
D3Hunter May 13, 2024
747e004
Revert "time"
D3Hunter May 14, 2024
9260217
test
D3Hunter May 14, 2024
5a55db2
change
D3Hunter May 14, 2024
64c914e
bazel
D3Hunter May 14, 2024
8ba6b5f
lint
D3Hunter May 14, 2024
a19a509
test
D3Hunter May 14, 2024
7f50f61
comments
D3Hunter May 14, 2024
040a45c
refine
D3Hunter May 14, 2024
738f11c
fix comments
D3Hunter May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/ddl/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ go_library(
"//pkg/util/engine",
"//pkg/util/filter",
"//pkg/util/gcutil",
"//pkg/util/generic",
"//pkg/util/hack",
"//pkg/util/intest",
"//pkg/util/logutil",
Expand Down
55 changes: 44 additions & 11 deletions pkg/ddl/ddl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ import (
"github.com/pingcap/tidb/pkg/util/dbterror"
"github.com/pingcap/tidb/pkg/util/dbterror/exeerrors"
"github.com/pingcap/tidb/pkg/util/gcutil"
"github.com/pingcap/tidb/pkg/util/generic"
"github.com/pingcap/tidb/pkg/util/syncutil"
"github.com/tikv/client-go/v2/tikvrpc"
clientv3 "go.etcd.io/etcd/client/v3"
Expand Down Expand Up @@ -366,15 +367,17 @@ type ddlCtx struct {
ownerManager owner.Manager
schemaSyncer syncer.SchemaSyncer
stateSyncer syncer.StateSyncer
ddlJobDoneCh chan struct{}
ddlEventCh chan<- *statsutil.DDLEvent
lease time.Duration // lease is schema lease, default 45s, see config.Lease.
binlogCli *pumpcli.PumpsClient // binlogCli is used for Binlog.
infoCache *infoschema.InfoCache
statsHandle *handle.Handle
tableLockCkr util.DeadTableLockChecker
etcdCli *clientv3.Client
autoidCli *autoid.ClientDiscover
// ddlJobDoneChMap is used to notify the session that the DDL job is finished.
// jobID -> chan struct{}
ddlJobDoneChMap generic.SyncMap[int64, chan struct{}]
ddlEventCh chan<- *statsutil.DDLEvent
lease time.Duration // lease is schema lease, default 45s, see config.Lease.
binlogCli *pumpcli.PumpsClient // binlogCli is used for Binlog.
infoCache *infoschema.InfoCache
statsHandle *handle.Handle
tableLockCkr util.DeadTableLockChecker
etcdCli *clientv3.Client
autoidCli *autoid.ClientDiscover

*waitSchemaSyncedController
*schemaVersionManager
Expand Down Expand Up @@ -618,6 +621,27 @@ func (dc *ddlCtx) notifyReorgWorkerJobStateChange(job *model.Job) {
rc.notifyJobState(job.State)
}

func (dc *ddlCtx) initJobDoneCh(jobID int64) {
dc.ddlJobDoneChMap.Store(jobID, make(chan struct{}, 1))
}

func (dc *ddlCtx) getJobDoneCh(jobID int64) (chan struct{}, bool) {
return dc.ddlJobDoneChMap.Load(jobID)
}

func (dc *ddlCtx) delJobDoneCh(jobID int64) {
dc.ddlJobDoneChMap.Delete(jobID)
}

func (dc *ddlCtx) notifyJobDone(jobID int64) {
if ch, ok := dc.ddlJobDoneChMap.Load(jobID); ok {
select {
case ch <- struct{}{}:
default:
}
}
}

// EnableTiFlashPoll enables TiFlash poll loop aka PollTiFlashReplicaStatus.
func EnableTiFlashPoll(d any) {
if dd, ok := d.(*ddl); ok {
Expand Down Expand Up @@ -711,7 +735,7 @@ func newDDL(ctx context.Context, options ...Option) *ddl {
uuid: id,
store: opt.Store,
lease: opt.Lease,
ddlJobDoneCh: make(chan struct{}, 1),
ddlJobDoneChMap: generic.NewSyncMap[int64, chan struct{}](10),
ownerManager: manager,
schemaSyncer: schemaSyncer,
stateSyncer: stateSyncer,
Expand Down Expand Up @@ -811,6 +835,9 @@ func (d *ddl) prepareWorkers4ConcurrencyDDL() {
})
d.wg.Run(d.startDispatchLoop)
d.wg.Run(d.startLocalWorkerLoop)
d.wg.Run(func() {
d.schemaSyncer.SyncJobSchemaVerLoop(d.ctx)
})
}

// Start implements DDL.Start interface.
Expand Down Expand Up @@ -1169,6 +1196,7 @@ func (d *ddl) DoDDLJob(ctx sessionctx.Context, job *model.Job) error {

// worker should restart to continue handling tasks in limitJobCh, and send back through task.err
err := <-task.errChs[0]
defer d.delJobDoneCh(job.ID)
if err != nil {
// The transaction of enqueuing job is failed.
return errors.Trace(err)
Expand Down Expand Up @@ -1205,13 +1233,18 @@ func (d *ddl) DoDDLJob(ctx sessionctx.Context, job *model.Job) error {
recordLastDDLInfo(ctx, historyJob)
}()
i := 0
notifyCh, ok := d.getJobDoneCh(job.ID)
if !ok {
// shouldn't happen, just give it a dummy one
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's OK to select from nil channel https://golangbyexample.com/select-with-nil-channel-golang/

notifyCh = make(chan struct{})
}
for {
failpoint.Inject("storeCloseInLoop", func(_ failpoint.Value) {
_ = d.Stop()
})

select {
case <-d.ddlJobDoneCh:
case <-notifyCh:
case <-ticker.C:
i++
ticker = updateTickerInterval(ticker, 10*d.lease, job, i)
Expand Down
5 changes: 4 additions & 1 deletion pkg/ddl/ddl_worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,9 @@ func (d *ddl) addBatchDDLJobs(tasks []*limitJobTask) error {

jobTasks = append(jobTasks, job)
injectModifyJobArgFailPoint(job)
if !job.LocalMode {
d.initJobDoneCh(job.ID)
}
}

se.GetSessionVars().SetDiskFullOpt(kvrpcpb.DiskFullOpt_AllowedOnAlmostFull)
Expand Down Expand Up @@ -859,7 +862,7 @@ func (w *worker) HandleJobDone(d *ddlCtx, job *model.Job, t *meta.Meta) error {
return err
}
CleanupDDLReorgHandles(job, w.sess)
asyncNotify(d.ddlJobDoneCh)
d.notifyJobDone(job.ID)
return nil
}

Expand Down
4 changes: 4 additions & 0 deletions pkg/ddl/mock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ func (s *MockSchemaSyncer) OwnerCheckAllVersions(ctx context.Context, jobID int6
}
}

// SyncJobSchemaVerLoop implements SchemaSyncer.SyncJobSchemaVerLoop interface.
func (*MockSchemaSyncer) SyncJobSchemaVerLoop(context.Context) {
}

// Close implements SchemaSyncer.Close interface.
func (*MockSchemaSyncer) Close() {}

Expand Down
8 changes: 6 additions & 2 deletions pkg/ddl/syncer/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ go_library(
"//pkg/metrics",
"//pkg/sessionctx/variable",
"//pkg/util",
"//pkg/util/disttask",
"@com_github_pingcap_errors//:errors",
"@com_github_pingcap_failpoint//:failpoint",
"@io_etcd_go_etcd_api_v3//mvccpb",
Expand All @@ -30,20 +31,23 @@ go_test(
timeout = "short",
srcs = [
"state_syncer_test.go",
"syncer_nokit_test.go",
"syncer_test.go",
],
embed = [":syncer"],
flaky = True,
shard_count = 3,
shard_count = 6,
deps = [
":syncer",
"//pkg/ddl",
"//pkg/ddl/util",
"//pkg/domain/infosync",
"//pkg/infoschema",
"//pkg/parser/terror",
"//pkg/sessionctx/variable",
"//pkg/store/mockstore",
"//pkg/util",
"@com_github_pingcap_errors//:errors",
"@com_github_pingcap_failpoint//:failpoint",
"@com_github_stretchr_testify//require",
"@io_etcd_go_etcd_api_v3//mvccpb",
"@io_etcd_go_etcd_client_v3//:client",
Expand Down
Loading