fix: scheduled forget silently skipped and hidden from operation log

Author: garethgeorge

internal/orchestrator/tasks/taskforget.go

@@ -143,73 +143,12 @@ func (t *ScheduledForgetTask) Next(now time.Time, runner TaskRunner) (ScheduledT
 	}, nil
 }
 
-// shouldSkip returns true if there are no new successful backups since the last scheduled forget.
-func (t *ScheduledForgetTask) shouldSkip(runner TaskRunner, repoProto *v1.Repo) bool {
-	var lastForgetEndMs int64
-	var hasNewBackup bool
-
-	_ = runner.QueryOperations(oplog.Query{}.
-		SetInstanceID(runner.InstanceID()).
-		SetRepoGUID(repoProto.GetGuid()).
-		SetPlanID(PlanForSystemTasks).
-		SetReversed(true), func(op *v1.Operation) error {
-		if op.Status != v1.OperationStatus_STATUS_SUCCESS {
-			return nil
-		}
-		if _, ok := op.Op.(*v1.Operation_OperationForget); ok && op.UnixTimeEndMs != 0 {
-			lastForgetEndMs = op.UnixTimeEndMs
-			return oplog.ErrStopIteration
-		}
-		return nil
-	})
-
-	if lastForgetEndMs == 0 {
-		return false // no previous forget, don't skip
-	}
-
-	// Check if any backup completed after the last forget.
-	// Intentionally not scoped by instance ID: in a sync setup the server receives
-	// backup operations from remote clients. We want forget to run whenever new
-	// snapshots appear in the repo regardless of which instance created them.
-	_ = runner.QueryOperations(oplog.Query{}.
-		SetRepoGUID(repoProto.GetGuid()).
-		SetReversed(true), func(op *v1.Operation) error {
-		if op.UnixTimeEndMs < lastForgetEndMs {
-			return oplog.ErrStopIteration // older than last forget, stop looking
-		}
-		if op.Status == v1.OperationStatus_STATUS_SUCCESS {
-			if _, ok := op.Op.(*v1.Operation_OperationBackup); ok {
-				hasNewBackup = true
-				return oplog.ErrStopIteration
-			}
-		}
-		return nil
-	})
-
-	return !hasNewBackup
-}
-
 func (t *ScheduledForgetTask) Run(ctx context.Context, st ScheduledTask, runner TaskRunner) error {
-	op := st.Op
-
 	repoProto, err := runner.GetRepo(t.RepoID())
 	if err != nil {
 		return NotifyError(ctx, runner, t.Name(), fmt.Errorf("get repo %q: %w", t.RepoID(), err), v1.Hook_CONDITION_FORGET_ERROR)
 	}
 
-	// Skip if no new backups since last forget run.
-	// Mark as system-cancelled so it doesn't count as a successful run
-	// and the next schedule is computed from the last actual forget.
-	// Interactive (force) runs always execute.
-	if !t.force && t.shouldSkip(runner, repoProto) {
-		op.Op = &v1.Operation_OperationForget{
-			OperationForget: &v1.OperationForget{},
-		}
-		op.Status = v1.OperationStatus_STATUS_SYSTEM_CANCELLED
-		op.DisplayMessage = "Skipped: no new backups since last forget"
-		return nil
-	}
-
 	err = forgetHelper(ctx, st, runner, repoProto.GetForgetPolicy().GetRetention(),
 		restic.WithFlags("--group-by", "tags"),
 	)