Merge pull request #6197 from planetscale/morgo-fix-timeout

Backport tablet timeout issue
vitessio · May 19, 2020 · d0580c9 · d0580c9
2 parents 96619f8 + 56c3a98
commit d0580c9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/go/cmd/vttablet/vttablet.go b/go/cmd/vttablet/vttablet.go
@@ -56,12 +56,13 @@ func main() {
 
  servenv.ParseFlags("vttablet")
 
+ tabletenv.Init()
+ // Load current config after tabletenv.Init, because it changes it.
  config := tabletenv.NewCurrentConfig()
  if err := config.Verify(); err != nil {
  log.Exitf("invalid config: %v", err)
  }
 
- tabletenv.Init()
  if *tabletConfig != "" {
  bytes, err := ioutil.ReadFile(*tabletConfig)
  if err != nil {