Skip to content

Revert "Merge pull request #1903 from dlom/HIVE-2038" #1914

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
abutcher merged 1 commit into from
Nov 15, 2022
Merged

Revert "Merge pull request #1903 from dlom/HIVE-2038" #1914

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
42 changes: 10 additions & 32 deletions pkg/controller/clustersync/clustersync_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,20 +223,6 @@ func AddToManager(mgr manager.Manager, r *ReconcileClusterSync, concurrentReconc
return err
}

// Watch for changes to ClusterSync. These have the same name/namespace as the relevant
// ClusterDeployment, so when a ClusterSync watch triggers, the CD of the same name will be reconciled.
// When the CD reconciles, it will look up the related ClusterSync.
if err := c.Watch(&source.Kind{Type: &hiveintv1alpha1.ClusterSync{}}, &handler.EnqueueRequestForObject{}); err != nil {
return err
}

// Watch for changes to ClusterSyncLease. These have the same name/namespace as the relevant
// ClusterDeployment, so when a ClusterSyncLease watch triggers, the CD of the same name will be reconciled.
// When the CD reconciles, it will look up the related ClusterSyncLease.
if err := c.Watch(&source.Kind{Type: &hiveintv1alpha1.ClusterSyncLease{}}, &handler.EnqueueRequestForObject{}); err != nil {
return err
}

return nil
}

Expand Down Expand Up @@ -421,6 +407,7 @@ func (r *ReconcileClusterSync) Reconcile(ctx context.Context, request reconcile.
return reconcile.Result{}, err
}

needToCreateClusterSync := false
clusterSync := &hiveintv1alpha1.ClusterSync{}
switch err := r.Get(context.Background(), request.NamespacedName, clusterSync); {
case apierrors.IsNotFound(err):
Expand All @@ -430,17 +417,13 @@ func (r *ReconcileClusterSync) Reconcile(ctx context.Context, request reconcile.
ownerRef := metav1.NewControllerRef(cd, cd.GroupVersionKind())
ownerRef.Controller = nil
clusterSync.OwnerReferences = []metav1.OwnerReference{*ownerRef}
switch err := r.Create(context.Background(), clusterSync); {
case apierrors.IsAlreadyExists(err):
// race condition, just proceed
case err != nil:
if err := r.Create(context.Background(), clusterSync); err != nil {
logger.WithError(err).Log(controllerutils.LogLevel(err), "could not create ClusterSync")
return reconcile.Result{}, err
default: // clusterSync was created successfully
recobsrv.SetOutcome(hivemetrics.ReconcileOutcomeClusterSyncCreated)
// requeue immediately so that we reconcile soon after the ClusterSync is created
return reconcile.Result{Requeue: true}, nil
}
recobsrv.SetOutcome(hivemetrics.ReconcileOutcomeClusterSyncCreated)
// requeue immediately so that we reconcile soon after the ClusterSync is created
return reconcile.Result{Requeue: true}, nil
case err != nil:
logger.WithError(err).Log(controllerutils.LogLevel(err), "could not get ClusterSync")
return reconcile.Result{}, err
Expand Down Expand Up @@ -470,15 +453,10 @@ func (r *ReconcileClusterSync) Reconcile(ctx context.Context, request reconcile.
return reconcile.Result{}, err
}

needToRenew := r.timeUntilRenew(lease) <= 0

if needToCreateLease {
logger.Info("need to reapply all syncsets (missing lease)")
} else if needToRenew {
logger.Info("need to reapply all syncsets (time to renew)")
needToDoFullReapply := needToCreateClusterSync || r.timeUntilFullReapply(lease) <= 0
if needToDoFullReapply {
logger.Info("need to reapply all syncsets")
}

needToDoFullReapply := needToCreateLease || needToRenew
recobsrv.SetOutcome(hivemetrics.ReconcileOutcomeFullSync)

// Apply SyncSets
Expand Down Expand Up @@ -547,7 +525,7 @@ func (r *ReconcileClusterSync) Reconcile(ctx context.Context, request reconcile.
}
}

result := reconcile.Result{Requeue: true, RequeueAfter: r.timeUntilRenew(lease)}
result := reconcile.Result{Requeue: true, RequeueAfter: r.timeUntilFullReapply(lease)}
if syncSetsNeedRequeue || selectorSyncSetsNeedRequeue {
result.RequeueAfter = 0
}
Expand Down Expand Up @@ -1153,7 +1131,7 @@ func orderResources(a, b hiveintv1alpha1.SyncResourceReference) bool {
return a.Name < b.Name
}

func (r *ReconcileClusterSync) timeUntilRenew(lease *hiveintv1alpha1.ClusterSyncLease) time.Duration {
func (r *ReconcileClusterSync) timeUntilFullReapply(lease *hiveintv1alpha1.ClusterSyncLease) time.Duration {
timeUntilNext := r.reapplyInterval - time.Since(lease.Spec.RenewTime.Time) +
time.Duration(reapplyIntervalJitter*rand.Float64()*r.reapplyInterval.Seconds())*time.Second
if timeUntilNext < 0 {
Expand Down