Skip to content
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

[Elastic Agent] Retry deamon reload during enroll #25590

Merged
merged 8 commits into from
May 14, 2021
Merged

[Elastic Agent] Retry deamon reload during enroll #25590

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c574d2e
backoff
michalpristas May 6, 2021
097ca87
Merge branch 'master' of github.com:elastic/beats into backoff-reload
michalpristas May 10, 2021
d8d662a
Merge branch 'master' of github.com:elastic/beats into backoff-reload
michalpristas May 11, 2021
39ea9b7
errors fix
michalpristas May 12, 2021
fc6b143
Merge branch 'master' of github.com:elastic/beats into backoff-reload
michalpristas May 12, 2021
d1c887f
Merge branch 'master' of github.com:elastic/beats into backoff-reload
michalpristas May 13, 2021
552cfc8
improvements
michalpristas May 13, 2021
d3167a5
Merge branch 'master' of github.com:elastic/beats into backoff-reload
michalpristas May 13, 2021
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
24 changes: 23 additions & 1 deletion x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ func (c *enrollCmd) fleetServerBootstrap(ctx context.Context) (string, error) {
var agentSubproc <-chan *os.ProcessState
if agentRunning {
// reload the already running agent
err = c.daemonReload(ctx)
err = c.daemonReloadWithBackoff(ctx)
if err != nil {
return "", errors.New(err, "failed to trigger elastic-agent daemon reload", errors.TypeApplication)
}
Expand Down Expand Up @@ -323,6 +323,28 @@ func (c *enrollCmd) prepareFleetTLS() error {
return nil
}

func (c *enrollCmd) daemonReloadWithBackoff(ctx context.Context) error {
err := c.daemonReload(ctx)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If no error here then no reason to continue. Just return as it has been reloaded.

if err == nil {
return nil
}

signal := make(chan struct{})
backExp := backoff.NewExpBackoff(signal, 10*time.Second, 1*time.Minute)

for i := 5; i >= 0; i-- {
backExp.Wait()
c.log.Info("Retrying to restart...")
err = c.daemonReload(ctx)
if err == nil {
break
}
}

close(signal)
return err
}

func (c *enrollCmd) daemonReload(ctx context.Context) error {
daemon := client.New()
err := daemon.Connect(ctx)
Expand Down