Skip to content

DM: Get DB flavor from source instead of guessing it #12427

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

Open
dveeden wants to merge 3 commits into
base: master
Choose a base branch
from
+8 −7
Open

DM: Get DB flavor from source instead of guessing it #12427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
402ef56
DM: Get DB flavor from source instead of guessing it
dveeden Nov 28, 2025
7cd4826
Update tests
dveeden Nov 28, 2025
da54b00
Update flavor source based on review
dveeden Nov 30, 2025
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
2 changes: 1 addition & 1 deletion dm/loader/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func getMydumpMetadata(ctx context.Context, cli *clientv3.Client, cfg *config.Su
log.L().Warn("TestRemoveMetaFile Error", log.ShortError(err))
}
})
loc, _, err := dumpling.ParseMetaData(ctx, cfg.LoaderConfig.Dir, metafile, cfg.ExtStorage)
loc, _, err := dumpling.ParseMetaData(ctx, cfg.LoaderConfig.Dir, metafile, cfg.ExtStorage, cfg.Flavor)
if err == nil {
return loc.Position.String(), loc.GTIDSetStr(), nil
}
Expand Down
7 changes: 4 additions & 3 deletions dm/pkg/dumpling/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,19 @@ func ParseMetaData(
dir string,
filename string,
extStorage brstorage.ExternalStorage,
flavor string,
) (*binlog.Location, *binlog.Location, error) {
fd, err := storage.OpenFile(ctx, dir, filename, extStorage)
if err != nil {
return nil, nil, err
}
defer fd.Close()

return ParseMetaDataByReader(filename, fd)
return ParseMetaDataByReader(filename, fd, flavor)
}

// ParseMetaDataByReader parses mydumper's output meta file by created reader and returns binlog location.
func ParseMetaDataByReader(filename string, rd io.Reader) (*binlog.Location, *binlog.Location, error) {
func ParseMetaDataByReader(filename string, rd io.Reader, flavor string) (*binlog.Location, *binlog.Location, error) {
invalidErr := fmt.Errorf("file %s invalid format", filename)

var (
Expand Down Expand Up @@ -156,7 +157,7 @@ func ParseMetaDataByReader(filename string, rd io.Reader) (*binlog.Location, *bi
return nil, nil, terror.ErrMetadataNoBinlogLoc.Generate(filename)
}

gset, err := gtid.ParserGTID("", gtidStr)
gset, err := gtid.ParserGTID(flavor, gtidStr)
if err != nil {
return nil, nil, invalidErr
}
Expand Down
4 changes: 2 additions & 2 deletions dm/pkg/dumpling/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ Finished dump at: 2020-09-30 12:16:49
for _, tc := range testCases {
err2 := os.WriteFile(f.Name(), []byte(tc.source), 0o644)
require.NoError(t, err2)
loc, loc2, err2 := ParseMetaData(ctx, fdir, fname, nil)
loc, loc2, err2 := ParseMetaData(ctx, fdir, fname, nil, "mysql")
require.NoError(t, err2)
require.Equal(t, tc.pos, loc.Position)
gs, _ := gtid.ParserGTID("mysql", tc.gsetStr)
Expand All @@ -274,7 +274,7 @@ Finished dump at: 2020-12-02 17:13:56
`
err = os.WriteFile(f.Name(), []byte(noBinlogLoc), 0o644)
require.NoError(t, err)
_, _, err = ParseMetaData(ctx, fdir, fname, nil)
_, _, err = ParseMetaData(ctx, fdir, fname, nil, "mysql")
require.True(t, terror.ErrMetadataNoBinlogLoc.Equal(err))
}

Expand Down
2 changes: 1 addition & 1 deletion dm/syncer/checkpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,7 +1302,7 @@ func (cp *RemoteCheckPoint) genUpdateSQL(cpSchema, cpTable string, location binl
func (cp *RemoteCheckPoint) parseMetaData(ctx context.Context) (*binlog.Location, *binlog.Location, error) {
// `metadata` is mydumper's output meta file name
filename := "metadata"
loc, loc2, err := dumpling.ParseMetaData(ctx, cp.cfg.LoaderConfig.Dir, filename, cp.cfg.ExtStorage)
loc, loc2, err := dumpling.ParseMetaData(ctx, cp.cfg.LoaderConfig.Dir, filename, cp.cfg.ExtStorage, cp.cfg.Flavor)
if err != nil {
toPrint, err2 := storage.ReadFile(ctx, cp.cfg.LoaderConfig.Dir, filename, nil)
if err2 != nil {
Expand Down