Skip to content

Accept newer revisions when waiting for policies to be assigned #1289

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

Merged
merged 1 commit into from
Jun 1, 2023
Merged

Accept newer revisions when waiting for policies to be assigned #1289

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 17 additions & 8 deletions internal/kibana/agents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ import (
"github.com/elastic/elastic-package/internal/signal"
)

var waitForPolicyAssignedTimeout = 10 * time.Minute
var (
waitForPolicyAssignedTimeout = 10 * time.Minute
waitForPolicyAssignedRetryPeriod = 2 * time.Second
)

// Agent represents an Elastic Agent enrolled with fleet.
type Agent struct {
Expand Down Expand Up @@ -83,12 +86,12 @@ func (c *Client) AssignPolicyToAgent(a Agent, p Policy) error {
}

func (c *Client) waitUntilPolicyAssigned(a Agent, p Policy) error {
timeout := time.Now().Add(waitForPolicyAssignedTimeout)
for {
if time.Now().After(timeout) {
return errors.New("timeout: policy hasn't been assigned in time")
}
timeout := time.NewTimer(waitForPolicyAssignedTimeout)
defer timeout.Stop()
ticker := time.NewTicker(waitForPolicyAssignedRetryPeriod)
defer ticker.Stop()

for {
if signal.SIGINT() {
return errors.New("SIGINT: cancel waiting for policy assigned")
}
Expand All @@ -99,13 +102,19 @@ func (c *Client) waitUntilPolicyAssigned(a Agent, p Policy) error {
}
logger.Debugf("Agent data: %s", agent.String())

if agent.PolicyID == p.ID && agent.PolicyRevision == p.Revision {
if agent.PolicyID == p.ID && agent.PolicyRevision >= p.Revision {
logger.Debugf("Policy revision assigned to the agent (ID: %s)...", a.ID)
break
}

logger.Debugf("Wait until the policy (ID: %s, revision: %d) is assigned to the agent (ID: %s)...", p.ID, p.Revision, a.ID)
time.Sleep(2 * time.Second)
select {
case <-timeout.C:
return errors.New("timeout: policy hasn't been assigned in time")
case <-ticker.C:
continue
}

}
return nil
}
Expand Down