Skip to content

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

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

Draft
Fkuloff wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52bc352
[addon-operator] create module hook queues regardless of DoModuleStartup
Fkuloff Aug 21, 2026
f59e416
[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
31 changes: 13 additions & 18 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 @@ -188,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 @@ -237,10 +234,8 @@ func (s *Task) Handle(ctx context.Context) (res queue.TaskResult) { //nolint:non

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

// Hook queues are normally created in the Startup phase, but only when
// DoModuleStartup is set, and a converge restart can displace that task.
// A missing queue would make every AddLastTaskToQueue below fail
// deterministically, so ensure the queues exist (the call is idempotent).
// 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.
Expand Down
Loading