Test with old impl

Signed-off-by: Arjun Raja Yogidas <[email protected]>

Author: coderbirju

Dockerfile.d/test-integration-rootless.sh

@@ -34,10 +34,22 @@ if [[ "$(id -u)" = "0" ]]; then
 	systemctl start ssh
 	exec ssh -o StrictHostKeyChecking=no rootless@localhost "$0" "$@"
 else
-	# Start D-Bus user session for systemd healthcheck timers
-	systemctl --user start dbus.socket dbus.service || true
+	# Ensure XDG_RUNTIME_DIR is set and create it if needed
+	export XDG_RUNTIME_DIR="/run/user/$(id -u)"
+	mkdir -p "$XDG_RUNTIME_DIR"
+	chmod 700 "$XDG_RUNTIME_DIR"
+	
+	# Start systemd user session and D-Bus for healthcheck timers
+	systemctl --user daemon-reload || true
+	systemctl --user start dbus.socket || true
+	systemctl --user start dbus.service || true
+	
+	# Set D-Bus session address
 	export DBUS_SESSION_BUS_ADDRESS="unix:path=$XDG_RUNTIME_DIR/bus"
 
+	# Wait a moment for D-Bus to be ready
+	sleep 1
+	
 	containerd-rootless-setuptool.sh install
 	if grep -q "options use-vc" /etc/resolv.conf; then
 		containerd-rootless-setuptool.sh nsenter -- sh -euc 'echo "options use-vc" >>/etc/resolv.conf'

cmd/nerdctl/container/container_run.go

@@ -447,9 +447,12 @@ func runAction(cmd *cobra.Command, args []string) error {
 	}
 
 	// Setup container healthchecks.
-	if err := healthcheck.CreateAndStartTimer(ctx, c, (*config.Config)(&createOpt.GOptions)); err != nil {
+	if err := healthcheck.CreateTimer(ctx, c, (*config.Config)(&createOpt.GOptions)); 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 createOpt.Detach {
 		fmt.Fprintln(createOpt.Stdout, id)

pkg/containerutil/containerutil.go

@@ -293,9 +293,12 @@ func Start(ctx context.Context, container containerd.Container, isAttach bool, i
 	}
 
 	// If container has health checks configured, create and start systemd timer/service files.
-	if err := healthcheck.CreateAndStartTimer(ctx, container, cfg); err != nil {
+	if err := healthcheck.CreateTimer(ctx, c, (*config.Config)(&createOpt.GOptions)); 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 !isAttach {
 		return nil
@@ -529,7 +532,7 @@ func Unpause(ctx context.Context, client *containerd.Client, id string, cfg *con
 	}
 
 	// Recreate healthcheck related systemd timer/service files.
-	if err := healthcheck.CreateAndStartTimer(ctx, container, cfg); err != nil {
+	if err := healthcheck.CreateTimer(ctx, container, cfg); err != nil {
 		return fmt.Errorf("failed to create healthcheck timer: %w", err)
 	}
 

pkg/healthcheck/healthcheck_manager_linux.go

@@ -63,10 +63,18 @@ func CreateTimer(ctx context.Context, container containerd.Container, cfg *confi
 	}
 
 	log.G(ctx).Debugf("creating healthcheck timer with: systemd-run %s", strings.Join(cmdOpts, " "))
+
+	// Add user flag for rootless mode
+	if rootlessutil.IsRootless() {
+		cmdOpts = append([]string{"--user"}, cmdOpts...)
+	}
+
 	run := exec.Command("systemd-run", cmdOpts...)
 	if out, err := run.CombinedOutput(); err != nil {
+		log.G(ctx).Errorf("systemd-run failed for container %s: %v\noutput: %s", containerID, err, strings.TrimSpace(string(out)))
 		return fmt.Errorf("systemd-run failed: %w\noutput: %s", err, strings.TrimSpace(string(out)))
 	}
+	log.G(ctx).Debugf("Successfully created healthcheck timer for container %s", containerID)
 
 	return nil
 }
@@ -371,7 +379,18 @@ func CreateAndStartTimer(ctx context.Context, container containerd.Container, cf
 	}
 
 	// Reload systemd and enable/start timer
+	log.G(ctx).Debugf("Attempting systemd reload for container %s", containerID)
 	if err := conn.ReloadContext(ctx); err != nil {
+		// Log additional debugging information
+		log.G(ctx).Errorf("systemd reload failed for container %s: %v", containerID, err)
+
+		// Try to get more information about the systemd state
+		if rootlessutil.IsRootless() {
+			log.G(ctx).Debugf("Running in rootless mode, checking user systemd status")
+		} else {
+			log.G(ctx).Debugf("Running in rootful mode, checking system systemd status")
+		}
+
 		return fmt.Errorf("systemd reload failed: %w", err)
 	}
 	_, _, err = conn.EnableUnitFilesContext(ctx, []string{containerID + ".timer"}, false, true)