Skip to content

[addon-operator] create module hook queues regardless of DoModuleStartup #826

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
ldmonster merged 2 commits into from
Aug 21, 2026
Merged

[addon-operator] create module hook queues regardless of DoModuleStartup #826

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77aa3f5
[addon-operator] create module hook queues regardless of DoModuleStartup
Fkuloff Aug 21, 2026
81823d0
[addon-operator] run module startup phase regardless of DoModuleStartup
Fkuloff Aug 21, 2026
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
67 changes: 46 additions & 21 deletions pkg/task/tasks/module-run/task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package modulerun

import (
"context"
"errors"
"fmt"
"log/slog"
"runtime/trace"
"strings"
Expand Down Expand Up @@ -186,26 +188,23 @@ func (s *Task) Handle(ctx context.Context) (res queue.TaskResult) { //nolint:non
// Register module hooks on every enable.
moduleRunErr = s.moduleManager.RegisterModuleHooks(baseModule, taskLogLabels)
if moduleRunErr == nil {
if hm.DoModuleStartup {
s.logger.Debug("ModuleRun phase",
slog.String(pkg.LogKeyPhase, string(baseModule.GetPhase())))
s.logger.Debug("ModuleRun phase",
slog.String(pkg.LogKeyPhase, string(baseModule.GetPhase())))

treg := trace.StartRegion(context.Background(), "ModuleRun-OnStartup")
treg := trace.StartRegion(context.Background(), "ModuleRun-OnStartup")

// Start queues for module hooks.
s.CreateAndStartQueuesForModuleHooks(baseModule.GetName())
// Start queues for module hooks.
s.CreateAndStartQueuesForModuleHooks(baseModule.GetName())

// Run onStartup hooks.
moduleRunErr = s.moduleManager.RunModuleHooks(ctx, baseModule, htypes.OnStartup, s.shellTask.GetLogLabels())
if moduleRunErr == nil {
s.moduleManager.SetModulePhaseAndNotify(baseModule, modules.OnStartupDone)
}

treg.End()
} else {
// Run onStartup hooks. The Startup phase already means they have not run, so this
// must not depend on DoModuleStartup, which each ModuleRun producer computes itself.
moduleRunErr = s.moduleManager.RunModuleHooks(ctx, baseModule, htypes.OnStartup, s.shellTask.GetLogLabels())
if moduleRunErr == nil {
s.moduleManager.SetModulePhaseAndNotify(baseModule, modules.OnStartupDone)
}

treg.End()

res.Status = queue.Repeat

return res
Expand Down Expand Up @@ -235,6 +234,10 @@ func (s *Task) Handle(ctx context.Context) (res queue.TaskResult) { //nolint:non

s.logger.Debug("ModuleRun phase", slog.String(pkg.LogKeyPhase, string(baseModule.GetPhase())))

// Queues are created in the Startup phase; ensure them again so that a hook
// registered later cannot lose its Synchronization task. Idempotent.
s.CreateAndStartQueuesForModuleHooks(hm.ModuleName)

// ModuleHookRun.Synchronization tasks for bindings with the "main" queue.
mainSyncTasks := make([]sh_task.Task, 0)
// ModuleHookRun.Synchronization tasks to add in parallel queues.
Expand Down Expand Up @@ -310,30 +313,52 @@ func (s *Task) Handle(ctx context.Context) (res queue.TaskResult) { //nolint:non
// Fail to enable bindings: cannot start Kubernetes monitors.
moduleRunErr = err
} else {
// A Synchronization task that is built but never queued would leave its
// binding invisible to SynchronizationState.IsCompleted (vacuously
// completed) and its kubernetes events locked forever. Collect queueing
// errors and fail the phase instead of dropping tasks silently: the
// retry rebuilds every Synchronization context, EnableKubernetesBindings
// is idempotent.
var queueErrs []error

queued := make([]sh_task.Task, 0, len(parallelSyncTasksToWait)+len(parallelSyncTasks))

// Queue parallel tasks that should be waited.
for _, tsk := range parallelSyncTasksToWait {
if err := s.queueService.AddLastTaskToQueue(tsk.GetQueueName(), tsk); err != nil {
s.logger.Error("queue is not found while EnableKubernetesBindings task",
slog.String(pkg.LogKeyQueue, tsk.GetQueueName()))
queueErrs = append(queueErrs,
fmt.Errorf("queue Synchronization task to '%s': %w", tsk.GetQueueName(), err))

continue
}

queued = append(queued, tsk)

thm := task.HookMetadataAccessor(tsk)
baseModule.Synchronization().QueuedForBinding(thm)
}

s.logTaskAdd("append", parallelSyncTasksToWait...)

// Queue regular parallel tasks.
for _, tsk := range parallelSyncTasks {
if err := s.queueService.AddLastTaskToQueue(tsk.GetQueueName(), tsk); err != nil {
s.logger.Error("queue is not found while EnableKubernetesBindings task",
slog.String(pkg.LogKeyQueue, tsk.GetQueueName()))
queueErrs = append(queueErrs,
fmt.Errorf("queue Synchronization task to '%s': %w", tsk.GetQueueName(), err))

continue
}

queued = append(queued, tsk)
}

s.logTaskAdd("append", parallelSyncTasks...)
s.logTaskAdd("append", queued...)

if len(queueErrs) > 0 {
moduleRunErr = errors.Join(queueErrs...)

res.Status = queue.Repeat

return res
}

if len(parallelSyncTasksToWait) == 0 {
// Skip waiting tasks in parallel queues, proceed to schedule bindings.
Expand Down
Loading