[Bugfix] [Platform] Ensure Inventory picks active leader #1986
Conversation
There was a problem hiding this comment.
Pull Request Overview
This PR refactors license member selection logic to ensure Active Failover deployments correctly select the active leader when managing licenses. The key change extracts duplicate member filtering code into a reusable function and adds special handling for Active Failover mode to only select members with the leader label.
- Extracted duplicate member filtering logic into
updateClusterLicenseMemberfunction - Added Active Failover mode detection to filter members by leader label
- Applied the refactored function to both
updateClusterLicenseKeyandupdateClusterLicenseAPI
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| pkg/deployment/reconcile/plan_builder_license.go | Extracts member selection logic into new function with Active Failover leader filtering; refactors duplicate code in license key and API methods |
| CHANGELOG.md | Documents the bugfix for Active Failover leader selection in inventory |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| if spec.Mode.Get() == api.DeploymentModeActiveFailover { | ||
| cache := context.ACS().CurrentClusterCache() | ||
|
|
||
| // For AF is different |
There was a problem hiding this comment.
The comment 'For AF is different' is grammatically incorrect. It should be 'AF is different' or 'For AF it is different'.
| // For AF is different | |
| // For AF, it is different |
| func (r *Reconciler) updateClusterLicenseMember(spec api.DeploymentSpec, status api.DeploymentStatus, context PlanBuilderContext) (api.DeploymentStatusMemberElement, bool) { | ||
| members := status.Members.AsListInGroups(arangod.GroupsWithLicenseV2()...).Filter(func(a api.DeploymentStatusMemberElement) bool { | ||
| i := a.Member.Image | ||
| if i == nil { | ||
| return false | ||
| } | ||
|
|
||
| return i.ArangoDBVersion.CompareTo("3.9.0") >= 0 && i.Enterprise | ||
| }) | ||
|
|
||
| if spec.Mode.Get() == api.DeploymentModeActiveFailover { | ||
| cache := context.ACS().CurrentClusterCache() | ||
|
|
||
| // For AF is different | ||
| members = members.Filter(func(a api.DeploymentStatusMemberElement) bool { | ||
| pod, ok := cache.Pod().V1().GetSimple(a.Member.Pod.GetName()) | ||
| if !ok { | ||
| return false | ||
| } | ||
|
|
||
| if _, ok := pod.Labels[k8sutil.LabelKeyArangoLeader]; ok { | ||
| return true | ||
| } | ||
|
|
||
| return false | ||
| }) | ||
| } |
There was a problem hiding this comment.
The function lacks documentation explaining its purpose, parameters, and return values. Consider adding a comment that explains this function selects an appropriate member for license operations, with special handling for Active Failover mode to ensure the leader is selected.
ajanikow
deleted the
bugfix/platform/ensure_inventory_picks_active_leader
branch
No description provided.