fix(operator): wake up for idle auto-stop — the timer had no driver

EmptySince was stamped and then never revisited: player joins/leaves do not
touch the CRD, RCON is only probed inside Reconcile, and a steady Running
server produces no watch events (its status update goes out unchanged and is a
no-op). Live, an empty server with a 30s grace sat Running for minutes with
zero reconciles in the log — the auto-stop existed only on paper.

reconcileRunning now returns a RequeueAfter for idle-enabled servers: exactly
at the deadline while empty, or a 30s probe cadence while occupied so the
moment the last player leaves is noticed. New unit tests pin all three:
deadline requeue, occupied cadence, and no requeue when disabled.
This commit is contained in:
Lemon-miaow committed 2026-09-23 04:05:31 +08:00
1 parent c04a3f083e
commit 1c89a5eeeb
2 files changed
+80 -1

No files matched your search

+20 -1
View File
@@ -35,6 +35,7 @@ const (
requeueStarting = 2 * time.Second
requeueStopping = 5 * time.Second
requeueSecret = 10 * time.Second
requeueIdleProbe = 30 * time.Second
defaultTimeoutSeconds = 300
defaultReadinessTimeoutSec = 300
)
@@ -197,7 +198,25 @@ func (r *Reconciler) reconcileRunning(ctx context.Context, server *v1alpha1.Mine
}
r.markRunningReady(server, players, endpointAddress)
return ctrl.Result{}, r.patchStatus(ctx, server)
if err := r.patchStatus(ctx, server); err != nil {
return ctrl.Result{}, err
}
// Idle auto-stop has no natural wake-up: player joins/leaves never touch
// this CRD and RCON is only probed here, so without a requeue the
// empty-duration counter would be stamped once and then never revisited
// (observed live: the stamp sat unexamined for minutes). Wake at the exact
// deadline while the tally says empty, or on a slow cadence while players
// are online, to notice the moment the last one leaves.
if server.Spec.Rcon.Enabled && server.Spec.Idle.AutoStopEnabled && server.Spec.Idle.EmptySecondsBeforeStop > 0 {
if server.Status.EmptySince != nil {
deadline := server.Status.EmptySince.Time.Add(time.Duration(server.Spec.Idle.EmptySecondsBeforeStop) * time.Second)
if wait := deadline.Sub(r.now().Time); wait > 0 {
return ctrl.Result{RequeueAfter: wait}, nil
}
}
return ctrl.Result{RequeueAfter: requeueIdleProbe}, nil
}
return ctrl.Result{}, nil
}
func (r *Reconciler) reconcileStopped(ctx context.Context, server *v1alpha1.MinecraftServer) (ctrl.Result, error) {