Skip to content

Allow reconciling from multiple replicas #365

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
fahedouch merged 2 commits into from
Apr 22, 2025
Merged

Allow reconciling from multiple replicas #365

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddbeac0
Allow reconciling from multiple replicas
julsemaan Mar 7, 2025
517e00e
Adjustments for CI checks
julsemaan Apr 22, 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
12 changes: 5 additions & 7 deletions internal/controller/ansibleRun/ansibleRun.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import (
kerrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

Expand Down Expand Up @@ -574,7 +574,7 @@ func (c *connector) releaseLease(ctx context.Context, kube client.Client, index
func (c *connector) acquireLease(ctx context.Context, kube client.Client, index int) error {
lease := &coordinationv1.Lease{}
leaseName := c.generateLeaseName(index)
leaseDurationSeconds := pointer.Int32(leaseDurationSeconds)
leaseDurationSeconds := ptr.To(int32(leaseDurationSeconds))

ns := "upbound-system"

Expand Down Expand Up @@ -611,7 +611,7 @@ func (c *connector) acquireLease(ctx context.Context, kube client.Client, index
}

// Update the lease to acquire it
lease.Spec.HolderIdentity = pointer.String(c.replicaID)
lease.Spec.HolderIdentity = ptr.To(c.replicaID)
lease.Spec.RenewTime = &metav1.MicroTime{Time: time.Now()}
lease.Spec.LeaseDurationSeconds = leaseDurationSeconds
if err := kube.Update(ctx, lease); err != nil {
Expand All @@ -627,10 +627,9 @@ func (c *connector) acquireLease(ctx context.Context, kube client.Client, index
}

// Finds an available shard and acquires a lease for it. Will attempt to obtain one indefinitely.
// This will also start a background go-routine to renew the lease continiously and release it when the process receives a shutdown signal
// This will also start a background go-routine to renew the lease continuously and release it when the process receives a shutdown signal
func (c *connector) acquireAndHoldShard(o controller.Options, s SetupOptions) (int, error) {
ctx := s.ProviderCtx
acquiredLease := false
currentShard := -1

cfg := ctrl.GetConfigOrDie()
Expand All @@ -640,12 +639,11 @@ func (c *connector) acquireAndHoldShard(o controller.Options, s SetupOptions) (i
}

AcquireLease:
for !acquiredLease {
for {
for i := 0; i < s.ReplicasCount; i++ {
if err := c.acquireLease(ctx, kube, i); err == nil {
currentShard = i
o.Logger.Debug("acquired lease", "id", i)
acquiredLease = true
go func() {
sigHandler := ctrl.SetupSignalHandler()

Expand Down
Loading