Merge branch 'containerd:main' into main

jay-mckay · web-flow · commit bb4286e0a3d3 · 2024-11-13T17:31:37.000-07:00
diff --git a/cgroup2/manager.go b/cgroup2/manager.go
@@ -942,14 +942,16 @@ func startUnit(conn *systemdDbus.Conn, group string, properties []systemdDbus.Pr
 		}
 	}
 
+	systemdStartUnitTimeout := 30 * time.Second
 	select {
 	case s := <-statusChan:
 		if s != "done" {
 			attemptFailedUnitReset(conn, group)
 			return fmt.Errorf("error creating systemd unit `%s`: got `%s`", group, s)
 		}
-	case <-time.After(30 * time.Second):
-		log.G(ctx).Warnf("Timed out while waiting for StartTransientUnit(%s) completion signal from dbus. Continuing...", group)
+	case <-time.After(systemdStartUnitTimeout):
+		attemptFailedUnitReset(conn, group)
+		return fmt.Errorf("timed out while waiting for StartTransientUnit(%s) completion signal from dbus after %v", group, systemdStartUnitTimeout)
 	}
 
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -942,14 +942,16 @@ func startUnit(conn *systemdDbus.Conn, group string, properties []systemdDbus.Pr`
`942`	`942`	`}`
`943`	`943`	`}`
`944`	`944`
	`945`	`+ systemdStartUnitTimeout := 30 * time.Second`
`945`	`946`	`select {`
`946`	`947`	`case s := <-statusChan:`
`947`	`948`	`if s != "done" {`
`948`	`949`	`attemptFailedUnitReset(conn, group)`
`949`	`950`	return fmt.Errorf("error creating systemd unit `%s`: got `%s`", group, s)
`950`	`951`	`}`
`951`		`- case <-time.After(30 * time.Second):`
`952`		`- log.G(ctx).Warnf("Timed out while waiting for StartTransientUnit(%s) completion signal from dbus. Continuing...", group)`
	`952`	`+ case <-time.After(systemdStartUnitTimeout):`
	`953`	`+ attemptFailedUnitReset(conn, group)`
	`954`	`+ return fmt.Errorf("timed out while waiting for StartTransientUnit(%s) completion signal from dbus after %v", group, systemdStartUnitTimeout)`
`953`	`955`	`}`
`954`	`956`
`955`	`957`	`return nil`