Unverified Commit 1847a711 authored by Hussein Galal's avatar Hussein Galal Committed by GitHub

Fix regression with cluster reset (#4524)

parent 5b456972
...@@ -173,17 +173,22 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont ...@@ -173,17 +173,22 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont
serverConfig.ControlConfig.DisableScheduler = true serverConfig.ControlConfig.DisableScheduler = true
serverConfig.ControlConfig.DisableCCM = true serverConfig.ControlConfig.DisableCCM = true
dataDir, err := datadir.LocalHome(cfg.DataDir, false)
if err != nil {
return err
}
// delete local loadbalancers state for apiserver and supervisor servers // delete local loadbalancers state for apiserver and supervisor servers
loadbalancer.ResetLoadBalancer(filepath.Join(cfg.DataDir, "agent"), loadbalancer.SupervisorServiceName) loadbalancer.ResetLoadBalancer(filepath.Join(dataDir, "agent"), loadbalancer.SupervisorServiceName)
loadbalancer.ResetLoadBalancer(filepath.Join(cfg.DataDir, "agent"), loadbalancer.APIServerServiceName) loadbalancer.ResetLoadBalancer(filepath.Join(dataDir, "agent"), loadbalancer.APIServerServiceName)
// at this point we're doing a restore. Check to see if we've // at this point we're doing a restore. Check to see if we've
// passed in a token and if not, check if the token file exists. // passed in a token and if not, check if the token file exists.
// If it doesn't, return an error indicating the token is necessary. // If it doesn't, return an error indicating the token is necessary.
if cfg.Token == "" { if cfg.Token == "" {
if _, err := os.Stat(filepath.Join(cfg.DataDir, "server/token")); err != nil { tokenFile := filepath.Join(dataDir, "server", "token")
if _, err := os.Stat(tokenFile); err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
return errors.New("") return errors.New(tokenFile + " does not exist, please pass --token to complete the restoration")
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment