Merge pull request #349 from jchorl/jchorl/ignoretimeout

fuweid · web-flow · commit ffca7cac8f18 · 2024-11-05T11:38:34.000-08:00
diff --git a/cgroup2/manager.go b/cgroup2/manager.go
@@ -952,14 +952,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
`@@ -952,14 +952,16 @@ func startUnit(conn *systemdDbus.Conn, group string, properties []systemdDbus.Pr`
`952`	`952`	`}`
`953`	`953`	`}`
`954`	`954`
	`955`	`+ systemdStartUnitTimeout := 30 * time.Second`
`955`	`956`	`select {`
`956`	`957`	`case s := <-statusChan:`
`957`	`958`	`if s != "done" {`
`958`	`959`	`attemptFailedUnitReset(conn, group)`
`959`	`960`	return fmt.Errorf("error creating systemd unit `%s`: got `%s`", group, s)
`960`	`961`	`}`
`961`		`- case <-time.After(30 * time.Second):`
`962`		`- log.G(ctx).Warnf("Timed out while waiting for StartTransientUnit(%s) completion signal from dbus. Continuing...", group)`
	`962`	`+ case <-time.After(systemdStartUnitTimeout):`
	`963`	`+ attemptFailedUnitReset(conn, group)`
	`964`	`+ return fmt.Errorf("timed out while waiting for StartTransientUnit(%s) completion signal from dbus after %v", group, systemdStartUnitTimeout)`
`963`	`965`	`}`
`964`	`966`
`965`	`967`	`return nil`