Skip to content

controller: order cluster updates by descending criticality level #670

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −16
Open

controller: order cluster updates by descending criticality level #670

Show file tree
Hide file tree
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
18 changes: 10 additions & 8 deletions controller/cluster_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,18 @@ func (clusterList *ClusterList) UpdateAvailable(configSource channel.ConfigSourc
}
}
sort.Slice(pendingUpdate, func(i, j int) bool {
pi := pendingUpdate[i].updatePriority
pj := pendingUpdate[j].updatePriority
ui, uj := pendingUpdate[i], pendingUpdate[j]

if pi > pj {
return true
} else if pi < pj {
return false
} else {
return pendingUpdate[i].lastProcessed.Before(pendingUpdate[j].lastProcessed)
if ui.updatePriority != uj.updatePriority {
return ui.updatePriority > uj.updatePriority
}

if ui.Cluster.CriticalityLevel != uj.Cluster.CriticalityLevel {
// Greater criticality levels processed first
return ui.Cluster.CriticalityLevel > uj.Cluster.CriticalityLevel
}

return ui.lastProcessed.Before(uj.lastProcessed)
})
clusterList.pendingUpdate = pendingUpdate
}
Expand Down
32 changes: 24 additions & 8 deletions controller/cluster_list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,23 +287,39 @@ func TestClusterPriority(t *testing.T) {
Channel: "dev",
Status: mockStatus,
}
criticality1 := &api.Cluster{
ID: "aws:123456789015:eu-central-1:criticality-1",
InfrastructureAccount: "aws:123456789015",
LifecycleStatus: "ready",
Channel: "dev",
Status: mockStatus,
CriticalityLevel: 1,
}
criticality2 := &api.Cluster{
ID: "aws:123456789016:eu-central-1:criticality-2",
InfrastructureAccount: "aws:123456789016",
LifecycleStatus: "ready",
Channel: "dev",
Status: mockStatus,
CriticalityLevel: 2,
}

for _, clusters := range [][]*api.Cluster{
{normal, decommissionRequested, pendingUpdate},
{normal, pendingUpdate, decommissionRequested},
{decommissionRequested, normal, pendingUpdate},
{decommissionRequested, pendingUpdate, normal},
{pendingUpdate, normal, decommissionRequested},
{pendingUpdate, decommissionRequested, normal},
{normal, decommissionRequested, pendingUpdate, criticality1, criticality2},
{normal, pendingUpdate, decommissionRequested, criticality1, criticality2},
{decommissionRequested, normal, pendingUpdate, criticality1, criticality2},
{decommissionRequested, pendingUpdate, normal, criticality1, criticality2},
{pendingUpdate, normal, decommissionRequested, criticality1, criticality2},
{pendingUpdate, decommissionRequested, normal, criticality1, criticality2},
} {
clusterList := NewClusterList(config.DefaultFilter)

clusterList.UpdateAvailable(MockChannelSource(false, false), clusters)
assert.Equal(t, []string{pendingUpdate.ID, decommissionRequested.ID, normal.ID}, allClusterIds(clusterList))
assert.Equal(t, []string{pendingUpdate.ID, decommissionRequested.ID, criticality2.ID, criticality1.ID, normal.ID}, allClusterIds(clusterList))

// add normal2, it should now be updated before normal1
clusterList.UpdateAvailable(MockChannelSource(false, false), append(clusters, normal2))
assert.Equal(t, []string{pendingUpdate.ID, decommissionRequested.ID, normal2.ID, normal.ID}, allClusterIds(clusterList))
assert.Equal(t, []string{pendingUpdate.ID, decommissionRequested.ID, criticality2.ID, criticality1.ID, normal2.ID, normal.ID}, allClusterIds(clusterList))
}
}

Expand Down