From bcd63e54dd9f1aa145bc063140ed4573009631ae Mon Sep 17 00:00:00 2001 From: Hussein Galal Date: Tue, 21 Dec 2021 20:28:57 +0200 Subject: [PATCH] [Engine-1.21] Close agentReady channel only in k3s (#4795) * Close agentReady channel only in k3s Signed-off-by: galal-hussein * codespell check Signed-off-by: galal-hussein --- pkg/cli/server/server.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/cli/server/server.go b/pkg/cli/server/server.go index da3e62c770..47a6097ab7 100644 --- a/pkg/cli/server/server.go +++ b/pkg/cli/server/server.go @@ -174,7 +174,13 @@ func run(app *cli.Context, cfg *cmds.Server, leaderControllers server.CustomCont serverConfig.ControlConfig.DisableScheduler = true serverConfig.ControlConfig.DisableCCM = true - close(agentReady) + // only close the agentReady channel in case of k3s restoration, because k3s does not start + // the agent until server returns successfully, unlike rke2's agent which starts in parallel + // with the server + if serverConfig.ControlConfig.SupervisorPort == serverConfig.ControlConfig.HTTPSPort { + close(agentReady) + } + dataDir, err := datadir.LocalHome(cfg.DataDir, false) if err != nil { return err