-
Notifications
You must be signed in to change notification settings - Fork 283
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.
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
syncer(dm): init schemaTracker when syncer run #6052
Merged
Merged
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
5e38c28
init schemaTracker when syncer run
buchuitoudegou ac6c120
fix: nil ptr exception
buchuitoudegou 8dceb81
fix comment
buchuitoudegou 77cfbca
update tracker comment
buchuitoudegou 5a82679
Merge branch 'master' into fix-6014
ti-chi-bot a713b5f
Merge branch 'master' into fix-6014
ti-chi-bot 85a9541
Merge branch 'master' into fix-6014
ti-chi-bot 73ddbc2
Merge branch 'master' into fix-6014
ti-chi-bot fe59d73
Merge branch 'master' into fix-6014
ti-chi-bot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -99,16 +99,25 @@ type DownstreamTableInfo struct { | |
WhereHandle *sqlmodel.WhereHandle | ||
} | ||
|
||
// NewTracker creates a new tracker. `sessionCfg` will be set as tracker's session variables if specified, or retrieve | ||
// NewTracker simply returns an empty Tracker, | ||
// which should be followed by an initialization before used. | ||
func NewTracker() *Tracker { | ||
return &Tracker{} | ||
} | ||
|
||
// Init initializes the Tracker. `sessionCfg` will be set as tracker's session variables if specified, or retrieve | ||
// some variable from downstream using `downstreamConn`. | ||
// NOTE **sessionCfg is a reference to caller**. | ||
func NewTracker( | ||
func (tr *Tracker) Init( | ||
ctx context.Context, | ||
task string, | ||
sessionCfg map[string]string, | ||
downstreamConn *dbconn.DBConn, | ||
logger log.Logger, | ||
) (*Tracker, error) { | ||
) error { | ||
if tr == nil { | ||
return nil | ||
} | ||
var ( | ||
err error | ||
storePath string | ||
|
@@ -148,28 +157,28 @@ func NewTracker( | |
var ignoredColumn interface{} | ||
rows, err2 := downstreamConn.QuerySQL(tctx, nil, fmt.Sprintf("SHOW VARIABLES LIKE '%s'", k)) | ||
if err2 != nil { | ||
return nil, err2 | ||
return err2 | ||
} | ||
if rows.Next() { | ||
var value string | ||
if err3 := rows.Scan(&ignoredColumn, &value); err3 != nil { | ||
return nil, err3 | ||
return err3 | ||
} | ||
sessionCfg[k] = value | ||
} | ||
// nolint:sqlclosecheck | ||
if err2 = rows.Close(); err2 != nil { | ||
return nil, err2 | ||
return err2 | ||
} | ||
if err2 = rows.Err(); err2 != nil { | ||
return nil, err2 | ||
return err2 | ||
} | ||
} | ||
} | ||
|
||
storePath, err = newTmpFolderForTracker(task) | ||
if err != nil { | ||
return nil, err | ||
return err | ||
} | ||
rollbackHolder.Add(fr.FuncRollback{Name: "DeleteStorePath", Fn: func() { | ||
_ = os.RemoveAll(storePath) | ||
|
@@ -179,7 +188,7 @@ func NewTracker( | |
mockstore.WithStoreType(mockstore.EmbedUnistore), | ||
mockstore.WithPath(storePath)) | ||
if err != nil { | ||
return nil, err | ||
return err | ||
} | ||
rollbackHolder.Add(fr.FuncRollback{Name: "CloseStore", Fn: func() { | ||
_ = store.Close() | ||
|
@@ -190,13 +199,13 @@ func NewTracker( | |
|
||
dom, err = session.BootstrapSession(store) | ||
if err != nil { | ||
return nil, err | ||
return err | ||
} | ||
rollbackHolder.Add(fr.FuncRollback{Name: "CloseDomain", Fn: dom.Close}) | ||
|
||
se, err = session.CreateSession(store) | ||
if err != nil { | ||
return nil, err | ||
return err | ||
} | ||
rollbackHolder.Add(fr.FuncRollback{Name: "CloseSession", Fn: se.Close}) | ||
|
||
|
@@ -216,13 +225,13 @@ func NewTracker( | |
log.L().Warn("can not set this variable", zap.Error(err)) | ||
continue | ||
} | ||
return nil, err | ||
return err | ||
} | ||
} | ||
for k, v := range globalVarsToSet { | ||
err = se.GetSessionVars().SetSystemVarWithRelaxedValidation(k, v) | ||
if err != nil { | ||
return nil, err | ||
return err | ||
} | ||
} | ||
// skip DDL test https://github.com/pingcap/tidb/pull/33079 | ||
|
@@ -233,22 +242,40 @@ func NewTracker( | |
// exist by default. So we need to drop it first. | ||
err = dom.DDL().DropSchema(se, model.NewCIStr("test")) | ||
if err != nil { | ||
return nil, err | ||
return err | ||
} | ||
|
||
// init downstreamTracker | ||
dsTracker := &downstreamTracker{ | ||
downstreamConn: downstreamConn, | ||
tableInfos: make(map[string]*DownstreamTableInfo), | ||
} | ||
tr.Lock() | ||
defer tr.Unlock() | ||
Comment on lines
+258
to
+259
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. now this lock is used in 3 places, please refine comments in There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
tr.storePath = storePath | ||
tr.store = store | ||
tr.dom = dom | ||
tr.se = se | ||
tr.dsTracker = dsTracker | ||
tr.closed.Store(false) | ||
return nil | ||
} | ||
|
||
return &Tracker{ | ||
storePath: storePath, | ||
store: store, | ||
dom: dom, | ||
se: se, | ||
dsTracker: dsTracker, | ||
}, nil | ||
// NewTestTracker creates an empty Tracker and initializes it subsequently. | ||
// It is useful for test. | ||
func NewTestTracker( | ||
ctx context.Context, | ||
task string, | ||
sessionCfg map[string]string, | ||
downstreamConn *dbconn.DBConn, | ||
logger log.Logger, | ||
) (*Tracker, error) { | ||
tr := NewTracker() | ||
err := tr.Init(ctx, task, sessionCfg, downstreamConn, logger) | ||
if err != nil { | ||
return nil, err | ||
} | ||
return tr, nil | ||
} | ||
|
||
func newTmpFolderForTracker(task string) (string, error) { | ||
|
@@ -392,10 +419,18 @@ func (tr *Tracker) Close() error { | |
if !tr.closed.CAS(false, true) { | ||
return nil | ||
} | ||
tr.se.Close() | ||
tr.dom.Close() | ||
if err := tr.store.Close(); err != nil { | ||
return err | ||
// Build of the Tracker and the initialization is divided. | ||
// these fields can possibly be nil if the Tracker is closed before the initialization. | ||
if tr.se != nil { | ||
tr.se.Close() | ||
} | ||
if tr.dom != nil { | ||
tr.dom.Close() | ||
} | ||
if tr.store != nil { | ||
if err := tr.store.Close(); err != nil { | ||
return err | ||
} | ||
} | ||
return os.RemoveAll(tr.storePath) | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
when will tr be nil?
if it's for test, we can change test instead
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line is copied from the old version. I remember it will let the
load_task
IT fail if deleted (probably this test case tries topause-task
before initializing the syncer). will take a look tomorrow.