Skip to content

Commit

Permalink
*: fix auto-id allocate tracing (#22371)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tiancaiamao
tiancaiamao committed Jan 13, 2021
1 parent 289bc7e commit 68aaa2f
Show file tree
Hide file tree
Showing 32 changed files with 105 additions and 98 deletions.
3 changes: 2 additions & 1 deletion ddl/column.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ package ddl

import (
"bytes"
"context"
"fmt"
"math/bits"
"strings"
Expand Down Expand Up @@ -1312,7 +1313,7 @@ func (w *updateColumnWorker) cleanRowMap() {
// BackfillDataInTxn will backfill the table record in a transaction, lock corresponding rowKey, if the value of rowKey is changed.
func (w *updateColumnWorker) BackfillDataInTxn(handleRange reorgBackfillTask) (taskCtx backfillTaskContext, errInTxn error) {
oprStartTime := time.Now()
errInTxn = kv.RunInNewTxn(w.sessCtx.GetStore(), true, func(txn kv.Transaction) error {
errInTxn = kv.RunInNewTxn(context.Background(), w.sessCtx.GetStore(), true, func(ctx context.Context, txn kv.Transaction) error {
taskCtx.addedCount = 0
taskCtx.scanCount = 0
txn.SetOption(kv.Priority, w.priority)
Expand Down
8 changes: 4 additions & 4 deletions ddl/column_change_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func (s *testColumnChangeSuite) SetUpSuite(c *C) {
Name: model.NewCIStr("test_column_change"),
ID: 1,
}
err := kv.RunInNewTxn(s.store, true, func(txn kv.Transaction) error {
err := kv.RunInNewTxn(context.Background(), s.store, true, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
return errors.Trace(t.CreateDatabase(s.dbInfo))
})
Expand Down Expand Up @@ -187,7 +187,7 @@ func (s *testColumnChangeSuite) TestModifyAutoRandColumnWithMetaKeyChanged(c *C)
tc.onJobRunBefore = func(job *model.Job) {
if atomic.LoadInt32(&errCount) > 0 && job.Type == model.ActionModifyColumn {
atomic.AddInt32(&errCount, -1)
genAutoRandErr = kv.RunInNewTxn(s.store, false, func(txn kv.Transaction) error {
genAutoRandErr = kv.RunInNewTxn(context.Background(), s.store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
_, err1 := t.GenAutoRandomID(s.dbInfo.ID, tableID, 1)
return err1
Expand All @@ -210,7 +210,7 @@ func (s *testColumnChangeSuite) TestModifyAutoRandColumnWithMetaKeyChanged(c *C)
c.Assert(genAutoRandErr, IsNil)
testCheckJobDone(c, d, job, true)
var newTbInfo *model.TableInfo
err = kv.RunInNewTxn(d.store, false, func(txn kv.Transaction) error {
err = kv.RunInNewTxn(context.Background(), d.store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
var err error
newTbInfo, err = t.GetTable(s.dbInfo.ID, tableID)
Expand Down Expand Up @@ -413,7 +413,7 @@ func (s *testColumnChangeSuite) checkAddPublic(sctx sessionctx.Context, d *ddl,

func getCurrentTable(d *ddl, schemaID, tableID int64) (table.Table, error) {
var tblInfo *model.TableInfo
err := kv.RunInNewTxn(d.store, false, func(txn kv.Transaction) error {
err := kv.RunInNewTxn(context.Background(), d.store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
var err error
tblInfo, err = t.GetTable(schemaID, tableID)
Expand Down
6 changes: 3 additions & 3 deletions ddl/db_change_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1192,7 +1192,7 @@ func (s *testStateChangeSuiteBase) prepareTestControlParallelExecSQL(c *C) (sess
}
var qLen int
for {
kv.RunInNewTxn(s.store, false, func(txn kv.Transaction) error {
kv.RunInNewTxn(context.Background(), s.store, false, func(ctx context.Context, txn kv.Transaction) error {
jobs, err1 := admin.GetDDLJobs(txn)
if err1 != nil {
return err1
Expand Down Expand Up @@ -1224,7 +1224,7 @@ func (s *testStateChangeSuiteBase) prepareTestControlParallelExecSQL(c *C) (sess
go func() {
var qLen int
for {
kv.RunInNewTxn(s.store, false, func(txn kv.Transaction) error {
kv.RunInNewTxn(context.Background(), s.store, false, func(ctx context.Context, txn kv.Transaction) error {
jobs, err3 := admin.GetDDLJobs(txn)
if err3 != nil {
return err3
Expand Down Expand Up @@ -1638,7 +1638,7 @@ func (s *serialTestStateChangeSuite) TestModifyColumnTypeArgs(c *C) {
ID, err := strconv.Atoi(jobID)
c.Assert(err, IsNil)
var historyJob *model.Job
err = kv.RunInNewTxn(s.store, false, func(txn kv.Transaction) error {
err = kv.RunInNewTxn(context.Background(), s.store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
historyJob, err = t.GetHistoryDDLJob(int64(ID))
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions ddl/db_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ func (s *testIntegrationSuite2) TestUpdateMultipleTable(c *C) {
}
t1Info.Columns = append(t1Info.Columns, newColumn)

kv.RunInNewTxn(s.store, false, func(txn kv.Transaction) error {
kv.RunInNewTxn(context.Background(), s.store, false, func(ctx context.Context, txn kv.Transaction) error {
m := meta.NewMeta(txn)
_, err = m.GenSchemaVersion()
c.Assert(err, IsNil)
Expand All @@ -706,7 +706,7 @@ func (s *testIntegrationSuite2) TestUpdateMultipleTable(c *C) {

newColumn.State = model.StatePublic

kv.RunInNewTxn(s.store, false, func(txn kv.Transaction) error {
kv.RunInNewTxn(context.Background(), s.store, false, func(ctx context.Context, txn kv.Transaction) error {
m := meta.NewMeta(txn)
_, err = m.GenSchemaVersion()
c.Assert(err, IsNil)
Expand Down Expand Up @@ -1323,7 +1323,7 @@ func checkGetMaxTableRowID(ctx *testMaxTableRowIDContext, store kv.Storage, expe
func getHistoryDDLJob(store kv.Storage, id int64) (*model.Job, error) {
var job *model.Job

err := kv.RunInNewTxn(store, false, func(txn kv.Transaction) error {
err := kv.RunInNewTxn(context.Background(), store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
var err1 error
job, err1 = t.GetHistoryDDLJob(id)
Expand Down
4 changes: 2 additions & 2 deletions ddl/db_partition_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2106,7 +2106,7 @@ func (s *testIntegrationSuite4) TestAddPartitionTooManyPartitions(c *C) {
func checkPartitionDelRangeDone(c *C, s *testIntegrationSuite, partitionPrefix kv.Key) bool {
hasOldPartitionData := true
for i := 0; i < waitForCleanDataRound; i++ {
err := kv.RunInNewTxn(s.store, false, func(txn kv.Transaction) error {
err := kv.RunInNewTxn(context.Background(), s.store, false, func(ctx context.Context, txn kv.Transaction) error {
it, err := txn.Iter(partitionPrefix, nil)
if err != nil {
return err
Expand Down Expand Up @@ -2914,7 +2914,7 @@ func (s *testIntegrationSuite5) TestDropSchemaWithPartitionTable(c *C) {
row := rows[0]
c.Assert(row.GetString(3), Equals, "drop schema")
jobID := row.GetInt64(0)
kv.RunInNewTxn(s.store, false, func(txn kv.Transaction) error {
kv.RunInNewTxn(context.Background(), s.store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
historyJob, err := t.GetHistoryDDLJob(jobID)
c.Assert(err, IsNil)
Expand Down
6 changes: 3 additions & 3 deletions ddl/db_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3136,7 +3136,7 @@ func (s *testSerialDBSuite) TestTruncateTable(c *C) {
tablePrefix := tablecodec.EncodeTablePrefix(oldTblID)
hasOldTableData := true
for i := 0; i < waitForCleanDataRound; i++ {
err = kv.RunInNewTxn(s.store, false, func(txn kv.Transaction) error {
err = kv.RunInNewTxn(context.Background(), s.store, false, func(ctx context.Context, txn kv.Transaction) error {
it, err1 := txn.Iter(tablePrefix, nil)
if err1 != nil {
return err1
Expand Down Expand Up @@ -5721,7 +5721,7 @@ func (s *testDBSuite4) testParallelExecSQL(c *C, sql1, sql2 string, se1, se2 ses
}
var qLen int
for {
err := kv.RunInNewTxn(s.store, false, func(txn kv.Transaction) error {
err := kv.RunInNewTxn(context.Background(), s.store, false, func(ctx context.Context, txn kv.Transaction) error {
jobs, err1 := admin.GetDDLJobs(txn)
if err1 != nil {
return err1
Expand Down Expand Up @@ -5751,7 +5751,7 @@ func (s *testDBSuite4) testParallelExecSQL(c *C, sql1, sql2 string, se1, se2 ses
go func() {
var qLen int
for {
err := kv.RunInNewTxn(s.store, false, func(txn kv.Transaction) error {
err := kv.RunInNewTxn(context.Background(), s.store, false, func(ctx context.Context, txn kv.Transaction) error {
jobs, err3 := admin.GetDDLJobs(txn)
if err3 != nil {
return err3
Expand Down
2 changes: 1 addition & 1 deletion ddl/ddl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ func (d *ddl) GetInfoSchemaWithInterceptor(ctx sessionctx.Context) infoschema.In

func (d *ddl) genGlobalIDs(count int) ([]int64, error) {
var ret []int64
err := kv.RunInNewTxn(d.store, true, func(txn kv.Transaction) error {
err := kv.RunInNewTxn(context.Background(), d.store, true, func(ctx context.Context, txn kv.Transaction) error {
failpoint.Inject("mockGenGlobalIDFail", func(val failpoint.Value) {
if val.(bool) {
failpoint.Return(errors.New("gofail genGlobalIDs error"))
Expand Down
6 changes: 3 additions & 3 deletions ddl/ddl_worker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ func (d *ddl) limitDDLJobs() {
// addBatchDDLJobs gets global job IDs and puts the DDL jobs in the DDL queue.
func (d *ddl) addBatchDDLJobs(tasks []*limitJobTask) {
startTime := time.Now()
err := kv.RunInNewTxn(d.store, true, func(txn kv.Transaction) error {
err := kv.RunInNewTxn(context.Background(), d.store, true, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
ids, err := t.GenGlobalIDs(len(tasks))
if err != nil {
Expand Down Expand Up @@ -265,7 +265,7 @@ func (d *ddl) addBatchDDLJobs(tasks []*limitJobTask) {
func (d *ddl) getHistoryDDLJob(id int64) (*model.Job, error) {
var job *model.Job

err := kv.RunInNewTxn(d.store, false, func(txn kv.Transaction) error {
err := kv.RunInNewTxn(context.Background(), d.store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
var err1 error
job, err1 = t.GetHistoryDDLJob(id)
Expand Down Expand Up @@ -430,7 +430,7 @@ func (w *worker) handleDDLJobQueue(d *ddlCtx) error {
runJobErr error
)
waitTime := 2 * d.lease
err := kv.RunInNewTxn(d.store, false, func(txn kv.Transaction) error {
err := kv.RunInNewTxn(context.Background(), d.store, false, func(ctx context.Context, txn kv.Transaction) error {
// We are not owner, return and retry checking later.
if !d.isOwner() {
return nil
Expand Down
22 changes: 11 additions & 11 deletions ddl/ddl_worker_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func (s *testDDLSuite) TestTableError(c *C) {
// Table ID or schema ID is wrong, so getting table is failed.
tblInfo := testTableInfo(c, d, "t", 3)
testCreateTable(c, ctx, d, dbInfo, tblInfo)
err := kv.RunInNewTxn(store, false, func(txn kv.Transaction) error {
err := kv.RunInNewTxn(context.Background(), store, false, func(ctx context.Context, txn kv.Transaction) error {
job.SchemaID = -1
job.TableID = -1
t := meta.NewMeta(txn)
Expand Down Expand Up @@ -339,7 +339,7 @@ func testCheckOwner(c *C, d *ddl, expectedVal bool) {
}

func testCheckJobDone(c *C, d *ddl, job *model.Job, isAdd bool) {
kv.RunInNewTxn(d.store, false, func(txn kv.Transaction) error {
kv.RunInNewTxn(context.Background(), d.store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
historyJob, err := t.GetHistoryDDLJob(job.ID)
c.Assert(err, IsNil)
Expand All @@ -355,7 +355,7 @@ func testCheckJobDone(c *C, d *ddl, job *model.Job, isAdd bool) {
}

func testCheckJobCancelled(c *C, d *ddl, job *model.Job, state *model.SchemaState) {
kv.RunInNewTxn(d.store, false, func(txn kv.Transaction) error {
kv.RunInNewTxn(context.Background(), d.store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
historyJob, err := t.GetHistoryDDLJob(job.ID)
c.Assert(err, IsNil)
Expand Down Expand Up @@ -1164,7 +1164,7 @@ func (s *testDDLSuite) TestBuildJobDependence(c *C) {
job7 := &model.Job{ID: 7, TableID: 2, Type: model.ActionModifyColumn}
job9 := &model.Job{ID: 9, SchemaID: 111, Type: model.ActionDropSchema}
job11 := &model.Job{ID: 11, TableID: 2, Type: model.ActionRenameTable, Args: []interface{}{int64(111), "old db name"}}
kv.RunInNewTxn(store, false, func(txn kv.Transaction) error {
kv.RunInNewTxn(context.Background(), store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
err := t.EnQueueDDLJob(job1)
c.Assert(err, IsNil)
Expand All @@ -1183,39 +1183,39 @@ func (s *testDDLSuite) TestBuildJobDependence(c *C) {
return nil
})
job4 := &model.Job{ID: 4, TableID: 1, Type: model.ActionAddIndex}
kv.RunInNewTxn(store, false, func(txn kv.Transaction) error {
kv.RunInNewTxn(context.Background(), store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
err := buildJobDependence(t, job4)
c.Assert(err, IsNil)
c.Assert(job4.DependencyID, Equals, int64(2))
return nil
})
job5 := &model.Job{ID: 5, TableID: 2, Type: model.ActionAddIndex}
kv.RunInNewTxn(store, false, func(txn kv.Transaction) error {
kv.RunInNewTxn(context.Background(), store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
err := buildJobDependence(t, job5)
c.Assert(err, IsNil)
c.Assert(job5.DependencyID, Equals, int64(3))
return nil
})
job8 := &model.Job{ID: 8, TableID: 3, Type: model.ActionAddIndex}
kv.RunInNewTxn(store, false, func(txn kv.Transaction) error {
kv.RunInNewTxn(context.Background(), store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
err := buildJobDependence(t, job8)
c.Assert(err, IsNil)
c.Assert(job8.DependencyID, Equals, int64(0))
return nil
})
job10 := &model.Job{ID: 10, SchemaID: 111, TableID: 3, Type: model.ActionAddIndex}
kv.RunInNewTxn(store, false, func(txn kv.Transaction) error {
kv.RunInNewTxn(context.Background(), store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
err := buildJobDependence(t, job10)
c.Assert(err, IsNil)
c.Assert(job10.DependencyID, Equals, int64(9))
return nil
})
job12 := &model.Job{ID: 12, SchemaID: 112, TableID: 2, Type: model.ActionAddIndex}
kv.RunInNewTxn(store, false, func(txn kv.Transaction) error {
kv.RunInNewTxn(context.Background(), store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
err := buildJobDependence(t, job12)
c.Assert(err, IsNil)
Expand Down Expand Up @@ -1308,7 +1308,7 @@ func (s *testDDLSuite) TestParallelDDL(c *C) {
qLen1 := int64(0)
qLen2 := int64(0)
for {
checkErr = kv.RunInNewTxn(store, false, func(txn kv.Transaction) error {
checkErr = kv.RunInNewTxn(context.Background(), store, false, func(ctx context.Context, txn kv.Transaction) error {
m := meta.NewMeta(txn)
qLen1, err = m.DDLJobQueueLen()
if err != nil {
Expand Down Expand Up @@ -1378,7 +1378,7 @@ func (s *testDDLSuite) TestParallelDDL(c *C) {
// check results.
isChecked := false
for !isChecked {
kv.RunInNewTxn(store, false, func(txn kv.Transaction) error {
kv.RunInNewTxn(context.Background(), store, false, func(ctx context.Context, txn kv.Transaction) error {
m := meta.NewMeta(txn)
lastJob, err := m.GetHistoryDDLJob(job11.ID)
c.Assert(err, IsNil)
Expand Down
2 changes: 1 addition & 1 deletion ddl/delete_range.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ func (dr *delRange) doTask(ctx sessionctx.Context, r util.DelRangeTask) error {
for {
finish := true
dr.keys = dr.keys[:0]
err := kv.RunInNewTxn(dr.store, false, func(txn kv.Transaction) error {
err := kv.RunInNewTxn(context.Background(), dr.store, false, func(ctx context.Context, txn kv.Transaction) error {
iter, err := txn.Iter(oldStartKey, r.EndKey)
if err != nil {
return errors.Trace(err)
Expand Down
4 changes: 2 additions & 2 deletions ddl/index.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,7 @@ func (w *addIndexWorker) BackfillDataInTxn(handleRange reorgBackfillTask) (taskC
})

oprStartTime := time.Now()
errInTxn = kv.RunInNewTxn(w.sessCtx.GetStore(), true, func(txn kv.Transaction) error {
errInTxn = kv.RunInNewTxn(context.Background(), w.sessCtx.GetStore(), true, func(ctx context.Context, txn kv.Transaction) error {
taskCtx.addedCount = 0
taskCtx.scanCount = 0
txn.SetOption(kv.Priority, w.priority)
Expand Down Expand Up @@ -1363,7 +1363,7 @@ func (w *cleanUpIndexWorker) BackfillDataInTxn(handleRange reorgBackfillTask) (t
})

oprStartTime := time.Now()
errInTxn = kv.RunInNewTxn(w.sessCtx.GetStore(), true, func(txn kv.Transaction) error {
errInTxn = kv.RunInNewTxn(context.Background(), w.sessCtx.GetStore(), true, func(ctx context.Context, txn kv.Transaction) error {
taskCtx.addedCount = 0
taskCtx.scanCount = 0
txn.SetOption(kv.Priority, w.priority)
Expand Down
2 changes: 1 addition & 1 deletion ddl/index_change_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func (s *testIndexChangeSuite) SetUpSuite(c *C) {
Name: model.NewCIStr("test_index_change"),
ID: 1,
}
err := kv.RunInNewTxn(s.store, true, func(txn kv.Transaction) error {
err := kv.RunInNewTxn(context.Background(), s.store, true, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
return errors.Trace(t.CreateDatabase(s.dbInfo))
})
Expand Down
2 changes: 1 addition & 1 deletion ddl/reorg.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ func (r *reorgInfo) UpdateReorgMeta(startKey kv.Key) error {
return nil
}

err := kv.RunInNewTxn(r.d.store, true, func(txn kv.Transaction) error {
err := kv.RunInNewTxn(context.Background(), r.d.store, true, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
return errors.Trace(t.UpdateDDLReorgHandle(r.Job, startKey, r.EndKey, r.PhysicalTableID, r.currElement))
})
Expand Down
6 changes: 3 additions & 3 deletions ddl/reorg_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func (s *testDDLSuite) TestReorg(c *C) {
EndKey: s.NewHandle().Int(0).Common(101, "string").Encoded(),
PhysicalTableID: 456,
}
err = kv.RunInNewTxn(d.store, false, func(txn kv.Transaction) error {
err = kv.RunInNewTxn(context.Background(), d.store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
var err1 error
_, err1 = getReorgInfo(d.ddlCtx, t, job, mockTbl, []*meta.Element{element})
Expand All @@ -152,7 +152,7 @@ func (s *testDDLSuite) TestReorg(c *C) {
job.SnapshotVer = uint64(1)
err = info.UpdateReorgMeta(info.StartKey)
c.Assert(err, IsNil)
err = kv.RunInNewTxn(d.store, false, func(txn kv.Transaction) error {
err = kv.RunInNewTxn(context.Background(), d.store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
info1, err1 := getReorgInfo(d.ddlCtx, t, job, mockTbl, []*meta.Element{element})
c.Assert(err1, IsNil)
Expand Down Expand Up @@ -230,7 +230,7 @@ func (s *testDDLSuite) TestReorgOwner(c *C) {

testDropSchema(c, ctx, d1, dbInfo)

err = kv.RunInNewTxn(d1.store, false, func(txn kv.Transaction) error {
err = kv.RunInNewTxn(context.Background(), d1.store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
db, err1 := t.GetDatabase(dbInfo.ID)
c.Assert(err1, IsNil)
Expand Down
4 changes: 2 additions & 2 deletions ddl/schema_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func testCheckSchemaState(c *C, d *ddl, dbInfo *model.DBInfo, state model.Schema
isDropped := true

for {
kv.RunInNewTxn(d.store, false, func(txn kv.Transaction) error {
kv.RunInNewTxn(context.Background(), d.store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
info, err := t.GetDatabase(dbInfo.ID)
c.Assert(err, IsNil)
Expand Down Expand Up @@ -227,7 +227,7 @@ func (s *testSchemaSuite) TestSchemaWaitJob(c *C) {

func testGetSchemaInfoWithError(d *ddl, schemaID int64) (*model.DBInfo, error) {
var dbInfo *model.DBInfo
err := kv.RunInNewTxn(d.store, false, func(txn kv.Transaction) error {
err := kv.RunInNewTxn(context.Background(), d.store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
var err1 error
dbInfo, err1 = t.GetDatabase(schemaID)
Expand Down
2 changes: 1 addition & 1 deletion ddl/serial_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ func (s *testSerialSuite) TestCanceledJobTakeTime(c *C) {
once := sync.Once{}
hook.OnJobUpdatedExported = func(job *model.Job) {
once.Do(func() {
err := kv.RunInNewTxn(s.store, false, func(txn kv.Transaction) error {
err := kv.RunInNewTxn(context.Background(), s.store, false, func(ctx context.Context, txn kv.Transaction) error {
t := meta.NewMeta(txn)
return t.DropTableOrView(job.SchemaID, job.TableID, true)
})
Expand Down
Loading

0 comments on commit 68aaa2f

Please sign in to comment.