Skip to content
This repository has been archived by the owner on Nov 24, 2023. It is now read-only.

worker: generate index flavor automatically by querying version info from DB #323

Merged
merged 20 commits into from
Oct 21, 2019
Merged

worker: generate index flavor automatically by querying version info from DB #323

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b58e467
simplify flavor
lichunzhu Oct 17, 2019
58d3de2
fix bugs
lichunzhu Oct 17, 2019
9296fd1
remove flavor
lichunzhu Oct 17, 2019
19ac343
add decrypt password
lichunzhu Oct 17, 2019
5e14b93
Merge branch 'master' into czli/dm-worker/simplifyFlavor
lichunzhu Oct 17, 2019
0becf14
fix bug
lichunzhu Oct 17, 2019
0d01ec0
merge master
lichunzhu Oct 17, 2019
6cdbdc0
Merge branch 'master' of https://github.com/pingcap/dm into czli/dm-w…
lichunzhu Oct 18, 2019
647b0d7
move get flavor to public pkg and change createDB
lichunzhu Oct 18, 2019
c945762
refine scope and imports
lichunzhu Oct 18, 2019
310af54
Merge branch 'master' into czli/dm-worker/simplifyFlavor
IANTHEREAL Oct 19, 2019
dfb6046
use utils from tidb-tools package
lichunzhu Oct 21, 2019
e9026c5
Merge branch 'czli/dm-worker/simplifyFlavor' of https://github.com/li…
lichunzhu Oct 21, 2019
332e670
refine code
lichunzhu Oct 21, 2019
2829d5b
refine config content
lichunzhu Oct 21, 2019
7e5c1b6
Merge branch 'master' into czli/dm-worker/simplifyFlavor
IANTHEREAL Oct 21, 2019
fb7847f
add timeout for getting flavor
lichunzhu Oct 21, 2019
ada458d
refine cancel and erros msg
lichunzhu Oct 21, 2019
04b1cdb
switch to Annotatef
lichunzhu Oct 21, 2019
bc2eecf
Update dm/worker/config.go
lichunzhu Oct 21, 2019
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
5 changes: 3 additions & 2 deletions dm/worker/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,11 @@ func (c *Config) adjustFlavor() error {
}
defer fromDB.Close()

ctx, _ := context.WithTimeout(context.Background(), flavorGetTimeout)
ctx, cancel := context.WithTimeout(context.Background(), flavorGetTimeout)
defer cancel()
c.Flavor, err = utils.GetFlavor(ctx, fromDB.DB)
if ctx.Err() != nil {
err = terror.Annotate(err, "time cost to get flavor info exceeds flavorGetTimeout")
err = terror.Annotate(err, "time cost to get flavor info exceeds "+flavorGetTimeout.String())
}
return terror.WithScope(err, terror.ScopeUpstream)
}
Expand Down