Revert "daemon/command: don't make notifyReady(), notifyStopping() asynchronous"

vvoland · vvoland · commit c6ca7d49f932 · 2026-02-13T13:05:09.000+01:00
This reverts commit 236fc46. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
diff --git a/daemon/command/daemon.go b/daemon/command/daemon.go
@@ -346,7 +346,7 @@ func (cli *daemonCLI) start(ctx context.Context) (err error) {
 	cli.setupConfigReloadTrap()
 
 	// after the daemon is done setting up we can notify systemd api
-	go notifyReady()
+	notifyReady()
 	log.G(ctx).Info("Daemon has completed initialization")
 
 	// Daemon is fully initialized. Start handling API traffic
@@ -379,7 +379,7 @@ func (cli *daemonCLI) start(ctx context.Context) (err error) {
 	c.Cleanup()
 
 	// notify systemd that we're shutting down
-	go notifyStopping()
+	notifyStopping()
 	shutdownDaemon(ctx, d)
 
 	// shutdown / close BuildKit backend
diff --git a/daemon/command/daemon_linux.go b/daemon/command/daemon_linux.go
@@ -50,12 +50,12 @@ func preNotifyReady() error {
 // notifyReady sends a message to the host when the server is ready to be used
 func notifyReady() {
 	// Tell the init daemon we are accepting requests
-	_, _ = systemdDaemon.SdNotify(false, systemdDaemon.SdNotifyReady)
+	go systemdDaemon.SdNotify(false, systemdDaemon.SdNotifyReady)
 }
 
 // notifyStopping sends a message to the host when the server is shutting down
 func notifyStopping() {
-	_, _ = systemdDaemon.SdNotify(false, systemdDaemon.SdNotifyStopping)
+	go systemdDaemon.SdNotify(false, systemdDaemon.SdNotifyStopping)
 }
 
 func validateCPURealtimeOptions(cfg *config.Config) error {

Original file line number	Diff line number	Diff line change
`@@ -50,12 +50,12 @@ func preNotifyReady() error {`
`50`	`50`	`// notifyReady sends a message to the host when the server is ready to be used`
`51`	`51`	`func notifyReady() {`
`52`	`52`	`// Tell the init daemon we are accepting requests`
`53`		`- _, _ = systemdDaemon.SdNotify(false, systemdDaemon.SdNotifyReady)`
	`53`	`+ go systemdDaemon.SdNotify(false, systemdDaemon.SdNotifyReady)`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`// notifyStopping sends a message to the host when the server is shutting down`
`57`	`57`	`func notifyStopping() {`
`58`		`- _, _ = systemdDaemon.SdNotify(false, systemdDaemon.SdNotifyStopping)`
	`58`	`+ go systemdDaemon.SdNotify(false, systemdDaemon.SdNotifyStopping)`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`func validateCPURealtimeOptions(cfg *config.Config) error {`