Skip to content

optimize: optimize healthcheck #5048

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

Open
ningmingxiao wants to merge 1 commit into
base: main
Choose a base branch
from
+58 −40
Open

optimize: optimize healthcheck #5048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 13 additions & 11 deletions cmd/nerdctl/container/container_run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,11 +459,6 @@ func runAction(cmd *cobra.Command, args []string) error {
return err
}

statusC, err := task.Wait(ctx)
if err != nil {
return err
}

Comment on lines -462 to -466

@haytok haytok Jul 7, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO, this seems unrelated to the optimization.

if err := task.Start(ctx); err != nil {
return err
}
Expand All @@ -480,12 +475,14 @@ func runAction(cmd *cobra.Command, args []string) error {
return err
}

// Setup container healthchecks.
if err := healthcheck.CreateTimer(ctx, c, (*config.Config)(&createOpt.GOptions), createOpt.NerdctlCmd, createOpt.NerdctlArgs); err != nil {
return fmt.Errorf("failed to create healthcheck timer: %w", err)
}
if err := healthcheck.StartTimer(ctx, c, (*config.Config)(&createOpt.GOptions)); err != nil {
return fmt.Errorf("failed to start healthcheck timer: %w", err)
if hcStr, ok := lab[labels.HealthCheck]; ok && hcStr != "" {
// Setup container healthchecks.
if err := healthcheck.CreateTimer(ctx, c, (*config.Config)(&createOpt.GOptions), createOpt.NerdctlCmd, createOpt.NerdctlArgs, lab); err != nil {
return fmt.Errorf("failed to create healthcheck timer: %w", err)
}
if err := healthcheck.StartTimer(ctx, c, (*config.Config)(&createOpt.GOptions), lab); err != nil {
return fmt.Errorf("failed to start healthcheck timer: %w", err)
}
}

if createOpt.Detach {
Expand All @@ -503,6 +500,11 @@ func runAction(cmd *cobra.Command, args []string) error {
}
}

statusC, err := task.Wait(ctx)
if err != nil {
return err
}

select {
// io.Wait() would return when either 1) the user detaches from the container OR 2) the container is about to exit.
//
Expand Down
36 changes: 23 additions & 13 deletions pkg/containerutil/containerutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,16 @@ func Start(ctx context.Context, container containerd.Container, isAttach bool, i
return err
}

if hcStr, ok := lab[labels.HealthCheck]; ok && hcStr != "" {
// If container has health checks configured, create and start systemd timer/service files.
if err := healthcheck.CreateTimer(ctx, container, cfg, nerdctlCmd, nerdctlArgs, lab); err != nil {
return fmt.Errorf("failed to create healthcheck timer: %w", err)
}
if err := healthcheck.StartTimer(ctx, container, cfg, lab); err != nil {
return fmt.Errorf("failed to start healthcheck timer: %w", err)
}
}

// Set status label running should call after task is started.
_, restartPolicyExist := lab[restart.PolicyLabel]
if restartPolicyExist {
Expand All @@ -303,14 +313,6 @@ func Start(ctx context.Context, container containerd.Container, isAttach bool, i
return err
}

// If container has health checks configured, create and start systemd timer/service files.
if err := healthcheck.CreateTimer(ctx, container, cfg, nerdctlCmd, nerdctlArgs); err != nil {
return fmt.Errorf("failed to create healthcheck timer: %w", err)
}
if err := healthcheck.StartTimer(ctx, container, cfg); err != nil {
return fmt.Errorf("failed to start healthcheck timer: %w", err)
}

if !isAttach {
return nil
}
Expand Down Expand Up @@ -542,12 +544,20 @@ func Unpause(ctx context.Context, client *containerd.Client, id string, cfg *con
return err
}

// Recreate healthcheck related systemd timer/service files.
if err := healthcheck.CreateTimer(ctx, container, cfg, nerdctlCmd, nerdctlArgs); err != nil {
return fmt.Errorf("failed to create healthcheck timer: %w", err)
label, err := container.Labels(ctx)
if err != nil {
return err
}
if err := healthcheck.StartTimer(ctx, container, cfg); err != nil {
return fmt.Errorf("failed to start healthcheck timer: %w", err)

hcStr, ok := label[labels.HealthCheck]
if !ok || hcStr == "" {
Comment on lines +552 to +553

@haytok haytok Jul 7, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This condition seems reversed:

Suggested change
hcStr, ok := label[labels.HealthCheck]
if !ok || hcStr == "" {
if hcStr, ok := label[labels.HealthCheck]; ok && hcStr != "" {

// Recreate healthcheck related systemd timer/service files.
if err := healthcheck.CreateTimer(ctx, container, cfg, nerdctlCmd, nerdctlArgs, label); err != nil {
return fmt.Errorf("failed to create healthcheck timer: %w", err)
}
if err := healthcheck.StartTimer(ctx, container, cfg, label); err != nil {
return fmt.Errorf("failed to start healthcheck timer: %w", err)
}
}

switch status.Status {
Expand Down
4 changes: 2 additions & 2 deletions pkg/healthcheck/healthcheck_manager_darwin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ import (
)

// CreateTimer sets up the transient systemd timer and service for healthchecks.
func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config, nerdctlCmd string, nerdctlArgs []string) error {
func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config, nerdctlCmd string, nerdctlArgs []string, label map[string]string) error {
return nil
}

// StartTimer starts the healthcheck timer unit.
func StartTimer(ctx context.Context, container containerd.Container, cfg *config.Config) error {
func StartTimer(ctx context.Context, container containerd.Container, cfg *config.Config, label map[string]string) error {
return nil
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/healthcheck/healthcheck_manager_freebsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ import (
)

// CreateTimer sets up the transient systemd timer and service for healthchecks.
func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config, nerdctlCmd string, nerdctlArgs []string) error {
func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config, nerdctlCmd string, nerdctlArgs []string, label map[string]string) error {
return nil
}

// StartTimer starts the healthcheck timer unit.
func StartTimer(ctx context.Context, container containerd.Container, cfg *config.Config) error {
func StartTimer(ctx context.Context, container containerd.Container, cfg *config.Config, label map[string]string) error {
return nil
}

Expand Down
26 changes: 16 additions & 10 deletions pkg/healthcheck/healthcheck_manager_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ import (
)

// CreateTimer sets up the transient systemd timer and service for healthchecks.
func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config, nerdctlCmd string, nerdctlArgs []string) error {
hc := extractHealthcheck(ctx, container)
func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config, nerdctlCmd string, nerdctlArgs []string, label map[string]string) error {
hc := extractHealthcheck(ctx, container, label)
if hc == nil {
return nil
}
Expand Down Expand Up @@ -106,8 +106,8 @@ func createDbusConn(ctx context.Context) (*dbus.Conn, error) {
}

// StartTimer starts the healthcheck timer unit.
func StartTimer(ctx context.Context, container containerd.Container, cfg *config.Config) error {
hc := extractHealthcheck(ctx, container)
func StartTimer(ctx context.Context, container containerd.Container, cfg *config.Config, label map[string]string) error {
hc := extractHealthcheck(ctx, container, label)
if hc == nil {
return nil
}
Expand Down Expand Up @@ -135,7 +135,7 @@ func StartTimer(ctx context.Context, container containerd.Container, cfg *config

// RemoveTransientHealthCheckFiles stops and cleans up the transient timer and service.
func RemoveTransientHealthCheckFiles(ctx context.Context, container containerd.Container) error {
hc := extractHealthcheck(ctx, container)
hc := extractHealthcheck(ctx, container, nil)
if hc == nil {
return nil
}
Expand Down Expand Up @@ -254,11 +254,17 @@ func ForceRemoveTransientHealthCheckFiles(ctx context.Context, containerID strin
return nil
}

func extractHealthcheck(ctx context.Context, container containerd.Container) *Healthcheck {
l, err := container.Labels(ctx)
if err != nil {
log.G(ctx).WithError(err).Debugf("could not get labels for container %s", container.ID())
return nil
func extractHealthcheck(ctx context.Context, container containerd.Container, label map[string]string) *Healthcheck {
var l map[string]string
var err error
if label == nil {
l, err = container.Labels(ctx)
if err != nil {
log.G(ctx).WithError(err).Debugf("could not get labels for container %s", container.ID())
return nil
}
} else {
l = label
}
hcStr, ok := l[labels.HealthCheck]
if !ok || hcStr == "" {
Expand Down
4 changes: 2 additions & 2 deletions pkg/healthcheck/healthcheck_manager_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ import (
)

// CreateTimer sets up the transient systemd timer and service for healthchecks.
func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config, nerdctlCmd string, nerdctlArgs []string) error {
func CreateTimer(ctx context.Context, container containerd.Container, cfg *config.Config, nerdctlCmd string, nerdctlArgs []string, label map[string]string) error {
return nil
}

// StartTimer starts the healthcheck timer unit.
func StartTimer(ctx context.Context, container containerd.Container, cfg *config.Config) error {
func StartTimer(ctx context.Context, container containerd.Container, cfg *config.Config, label map[string]string) error {
return nil
}

Expand Down
Loading