Skip to content

Eviction: Normalize polling time, fix RequeueAfter<=0 #156

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
fwiesel merged 1 commit into from
Oct 20, 2025
Merged

Eviction: Normalize polling time, fix RequeueAfter<=0 #156

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
12 changes: 7 additions & 5 deletions internal/controller/eviction_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ type EvictionReconciler struct {
const (
evictionFinalizerName = "eviction-controller.cloud.sap/finalizer"
EvictionControllerName = "eviction"
shortRetryTime = 1 * time.Second
defaultPollTime = 10 * time.Second
)

// +kubebuilder:rbac:groups=kvm.cloud.sap,resources=evictions,verbs=get;list;watch;create;update;patch;delete
Expand Down Expand Up @@ -253,7 +255,7 @@ func (r *EvictionReconciler) evictNext(ctx context.Context, eviction *kvmv1.Evic
switch vm.Status {
case "MIGRATING", "RESIZE":
// wait for the migration to finish
return ctrl.Result{RequeueAfter: 5 * time.Second}, nil
return ctrl.Result{RequeueAfter: defaultPollTime}, nil
case "ERROR":
// Needs manual intervention (or another operator fixes it)
// put it at the end of the list (beginning of array)
Expand Down Expand Up @@ -290,7 +292,7 @@ func (r *EvictionReconciler) evictNext(ctx context.Context, eviction *kvmv1.Evic
if gophercloud.ResponseCodeIs(err, http.StatusNotFound) {
log.Info("Instance is gone")
// Fall-back to beginning, which will clean it out
return ctrl.Result{Requeue: true}, nil
return ctrl.Result{RequeueAfter: shortRetryTime}, nil
}
// Retry confirm in next reconciliation
return ctrl.Result{}, err
Expand Down Expand Up @@ -322,7 +324,7 @@ func (r *EvictionReconciler) evictNext(ctx context.Context, eviction *kvmv1.Evic
if gophercloud.ResponseCodeIs(err, http.StatusNotFound) {
log.Info("Instance is gone")
// Fall-back to beginning, which will clean it out
return ctrl.Result{RequeueAfter: 0}, nil
return ctrl.Result{RequeueAfter: shortRetryTime}, nil
}
copy((*instances)[1:], (*instances)[:len(*instances)-1])
(*instances)[0] = uuid
Expand All @@ -344,7 +346,7 @@ func (r *EvictionReconciler) evictNext(ctx context.Context, eviction *kvmv1.Evic
if err := r.coldMigrate(ctx, vm.ID, eviction); err != nil {
if gophercloud.ResponseCodeIs(err, http.StatusNotFound) {
log.Info("Instance is gone")
return ctrl.Result{RequeueAfter: 0}, nil
return ctrl.Result{RequeueAfter: shortRetryTime}, nil
}
copy((*instances)[1:], (*instances)[:len(*instances)-1])
(*instances)[0] = uuid
Expand All @@ -366,7 +368,7 @@ func (r *EvictionReconciler) evictNext(ctx context.Context, eviction *kvmv1.Evic
// Triggered a migration, give it a generous time to start, so we do not
// see the old state because the migration didn't start
log.Info("poll")
return ctrl.Result{RequeueAfter: 30 * time.Second}, err
return ctrl.Result{RequeueAfter: defaultPollTime}, err
}

func (r *EvictionReconciler) evictionReason(eviction *kvmv1.Eviction) string {
Expand Down
Loading