alt-orchestra/talos
1
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases Wiki Activity

fix: print task failure error immediately

Browse Source 
The way processing works is that errors are not printed in the
sequencer, but something which called the sequencer prints the error,
but this means that for fatal failures say in 'upgrade' sequence error
message is printed by machined after the `apid` is stopped.

This means that error won't be visible via `talosctl dmesg`, but only in
serial console.

This changes the flow to print the task error as soon as task fails, and
removes 'done' messages in the sequencer if sequence/phase/task fails
(as otherwise it has both 'done' and 'failed' message which is
confusing).

Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
This commit is contained in:
Andrey Smirnov 2021-04-01 23:43:45 +03:00 committed by talos-bot
parent e039172eda
commit 063d1abe9c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_controller.go
View File

@ -279,9 +279,9 @@ func (c *Controller) run(ctx context.Context, seq runtime.Sequence, phases []run
if !runtime.IsRebootError(err) {
log.Printf("%s sequence: failed", seq.String())
}
} else {
log.Printf("%s sequence: done: %s", seq.String(), time.Since(start))
}
log.Printf("%s sequence: done: %s", seq.String(), time.Since(start))
}()
for number, phase = range phases {
@ -302,13 +302,13 @@ func (c *Controller) run(ctx context.Context, seq runtime.Sequence, phases []run
return fmt.Errorf("error running phase %d in %s sequence: %w", number, seq.String(), err)
}
log.Printf("phase %s (%s): done, %s", phase.Name, progress, time.Since(start))
select {
case <-ctx.Done():
return ctx.Err()
default:
}
log.Printf("phase %s (%s): done, %s", phase.Name, progress, time.Since(start))
}
return nil
@ -369,11 +369,11 @@ func (c *Controller) runTask(ctx context.Context, progress string, f runtime.Tas
defer func() {
if err != nil {
if !runtime.IsRebootError(err) {
log.Printf("task %s (%s): failed", taskName, progress)
log.Printf("task %s (%s): failed: %s", taskName, progress, err)
}
} else {
log.Printf("task %s (%s): done, %s", taskName, progress, time.Since(start))
}
log.Printf("task %s (%s): done, %s", taskName, progress, time.Since(start))
}()
defer c.Runtime().Events().Publish(&machine.TaskEvent{