master, config(dm): fix case-sensitive compatibility for dmctl #5307
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
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 |
|---|---|---|
|
|
@@ -15,6 +15,7 @@ package master | |
|
|
||
| import ( | ||
| "context" | ||
| "database/sql" | ||
| "encoding/binary" | ||
| "fmt" | ||
| "math/rand" | ||
|
|
@@ -86,7 +87,11 @@ var ( | |
| registerOnce sync.Once | ||
| runBackgroundOnce sync.Once | ||
|
|
||
| // the difference of below functions is checkAndAdjustSourceConfigForDMCtlFunc will not AdjustCaseSensitive. It's a | ||
| // compatibility compromise. | ||
| // When we need to change the implementation of dmctl to OpenAPI, we should notice the user about this change. | ||
|
There was a problem hiding this comment. this upgrade case is so complex, we may add breaking change in doc and release note see here |
||
| checkAndAdjustSourceConfigFunc = checkAndAdjustSourceConfig | ||
| checkAndAdjustSourceConfigForDMCtlFunc = checkAndAdjustSourceConfigForDMCtl | ||
| ) | ||
|
|
||
| // Server handles RPC requests for dm-master. | ||
|
|
@@ -1311,15 +1316,19 @@ func parseAndAdjustSourceConfig(ctx context.Context, contents []string) ([]*conf | |
| if err != nil { | ||
| return cfgs, err | ||
| } | ||
| if err := checkAndAdjustSourceConfigForDMCtlFunc(ctx, cfg); err != nil { | ||
| return cfgs, err | ||
| } | ||
| cfgs[i] = cfg | ||
| } | ||
| return cfgs, nil | ||
| } | ||
|
|
||
| func innerCheckAndAdjustSourceConfig( | ||
| ctx context.Context, | ||
| cfg *config.SourceConfig, | ||
| hook func(sourceConfig *config.SourceConfig, ctx context.Context, db *sql.DB) error, | ||
| ) error { | ||
| dbConfig := cfg.GenerateDBConfig() | ||
| fromDB, err := conn.DefaultDBProvider.Apply(dbConfig) | ||
| if err != nil { | ||
|
|
@@ -1329,12 +1338,25 @@ func checkAndAdjustSourceConfig(ctx context.Context, cfg *config.SourceConfig) e | |
| if err = cfg.Adjust(ctx, fromDB.DB); err != nil { | ||
| return err | ||
| } | ||
| if hook != nil { | ||
| if err = hook(cfg, ctx, fromDB.DB); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| if _, err = cfg.Yaml(); err != nil { | ||
| return err | ||
| } | ||
| return cfg.Verify() | ||
| } | ||
|
|
||
| func checkAndAdjustSourceConfig(ctx context.Context, cfg *config.SourceConfig) error { | ||
| return innerCheckAndAdjustSourceConfig(ctx, cfg, (*config.SourceConfig).AdjustCaseSensitive) | ||
| } | ||
|
|
||
| func checkAndAdjustSourceConfigForDMCtl(ctx context.Context, cfg *config.SourceConfig) error { | ||
| return innerCheckAndAdjustSourceConfig(ctx, cfg, nil) | ||
| } | ||
|
|
||
| func parseSourceConfig(contents []string) ([]*config.SourceConfig, error) { | ||
| cfgs := make([]*config.SourceConfig, len(contents)) | ||
| for i, content := range contents { | ||
|
|
||
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
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.
I remembered why this change was introduced, it's because when implementing openAPI , I was referring to the v2 version of the task config 😵