Skip to content

Clear upgrade_attempts on handleAck #4762

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 3 commits into from
Apr 7, 2025
Merged

Clear upgrade_attempts on handleAck #4762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a26c28
clear upgrade_attempts on handleAck
juliaElastic Apr 2, 2025
0c00021
clear upgrade_attempts if upgrade_details is missing
juliaElastic Apr 4, 2025
b35ed8d
added unit test
juliaElastic Apr 4, 2025
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
3 changes: 3 additions & 0 deletions internal/pkg/api/handleAck.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,9 @@ func (ack *AckT) handleUpgrade(ctx context.Context, zlog zerolog.Logger, agent *
dl.FieldUpgradeStatus: nil,
dl.FieldUpgradedAt: now,
}
if agent.UpgradeDetails == nil {
doc[dl.FieldUpgradeAttempts] = nil
}
}

body, err := doc.Marshal()
Expand Down
48 changes: 42 additions & 6 deletions internal/pkg/api/handleAck_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,14 +673,26 @@ func TestAckHandleUpgrade(t *testing.T) {
name string
event UpgradeEvent
bulker func(t *testing.T) *ftesting.MockBulk
agent *model.Agent
}{{
name: "ok",
event: UpgradeEvent{},
bulker: func(t *testing.T) *ftesting.MockBulk {
m := ftesting.NewMockBulk()
m.On("Update", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil).Once()
m.On("Update", mock.Anything, mock.Anything, mock.Anything, mock.MatchedBy(func(p []byte) bool {
var body map[string]map[string]interface{}
if err := json.Unmarshal(p, &body); err != nil {
t.Fatal(err)
}
upgradeAttempts, ok := body["doc"]["upgrade_attempts"]
return ok == true && upgradeAttempts == nil
}), mock.Anything).Return(nil).Once()
return m
},
agent: &model.Agent{
ESDocument: model.ESDocument{Id: "ab12dcd8-bde0-4045-92dc-c4b27668d735"},
Agent: &model.AgentMetadata{Version: "8.0.0"},
},
}, {
name: "retry signaled",
event: UpgradeEvent{
Expand Down Expand Up @@ -708,6 +720,10 @@ func TestAckHandleUpgrade(t *testing.T) {
}), mock.Anything).Return(nil).Once()
return m
},
agent: &model.Agent{
ESDocument: model.ESDocument{Id: "ab12dcd8-bde0-4045-92dc-c4b27668d735"},
Agent: &model.AgentMetadata{Version: "8.0.0"},
},
}, {
name: "no more retries",
event: UpgradeEvent{
Expand All @@ -734,14 +750,34 @@ func TestAckHandleUpgrade(t *testing.T) {
}), mock.Anything).Return(nil).Once()
return m
},
agent: &model.Agent{
ESDocument: model.ESDocument{Id: "ab12dcd8-bde0-4045-92dc-c4b27668d735"},
Agent: &model.AgentMetadata{Version: "8.0.0"},
},
}, {
name: "keep upgrade_attempts if upgrade_details is not nil",
event: UpgradeEvent{},
bulker: func(t *testing.T) *ftesting.MockBulk {
m := ftesting.NewMockBulk()
m.On("Update", mock.Anything, mock.Anything, mock.Anything, mock.MatchedBy(func(p []byte) bool {
var body map[string]map[string]interface{}
if err := json.Unmarshal(p, &body); err != nil {
t.Fatal(err)
}
_, ok := body["doc"]["upgrade_attempts"]
return ok == false
}), mock.Anything).Return(nil).Once()
return m
},
agent: &model.Agent{
ESDocument: model.ESDocument{Id: "ab12dcd8-bde0-4045-92dc-c4b27668d735"},
Agent: &model.AgentMetadata{Version: "8.0.0"},
UpgradeDetails: &model.UpgradeDetails{},
},
}}
cfg := &config.Server{
Limits: config.ServerLimits{},
}
agent := &model.Agent{
ESDocument: model.ESDocument{Id: "ab12dcd8-bde0-4045-92dc-c4b27668d735"},
Agent: &model.AgentMetadata{Version: "8.0.0"},
}
ctx := context.Background()
cache, err := cache.New(config.Cache{NumCounters: 100, MaxCost: 100000})
if err != nil {
Expand All @@ -753,7 +789,7 @@ func TestAckHandleUpgrade(t *testing.T) {
bulker := tc.bulker(t)
ack := NewAckT(cfg, bulker, cache)

err := ack.handleUpgrade(ctx, logger, agent, tc.event)
err := ack.handleUpgrade(ctx, logger, tc.agent, tc.event)
assert.NoError(t, err)
bulker.AssertExpectations(t)
})
Expand Down
Loading