Revert "daemon/command: add support for sd_notify "reload" notifications"

vvoland · vvoland · commit ddb636c2bdb9 · 2026-02-13T13:05:06.000+01:00
This reverts commit af18206. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
diff --git a/daemon/command/daemon.go b/daemon/command/daemon.go
@@ -531,13 +531,6 @@ func (cli *daemonCLI) reloadConfig() {
 		}
 	}
 
-	// On Linux, we use sd_notify to indicate we're reloading config. We send
-	// this signal as early as possible to let systemd know we're reloading,
-	// but must signal "ready" after this completes (even on failure), which
-	// is done by the reload function defined above.
-	done := notifyReloading()
-	defer done()
-
 	if err := config.Reload(*cli.configFile, cli.flags, reload); err != nil {
 		log.G(ctx).WithError(err).Error("Error reloading configuration")
 		return
diff --git a/daemon/command/daemon_freebsd.go b/daemon/command/daemon_freebsd.go
@@ -11,10 +11,6 @@ func preNotifyReady() error {
 func notifyReady() {
 }
 
-// notifyReloading sends a message to the host when the server got signaled to
-// reloading its configuration. It is a no-op on FreeBSD.
-func notifyReloading() func() { return func() {} }
-
 // notifyStopping sends a message to the host when the server is shutting down
 func notifyStopping() {
 }
diff --git a/daemon/command/daemon_linux.go b/daemon/command/daemon_linux.go
@@ -58,25 +58,6 @@ func notifyStopping() {
 	_, _ = systemdDaemon.SdNotify(false, systemdDaemon.SdNotifyStopping)
 }
 
-// notifyReloading sends a message to the host when the server got signaled to
-// reloading its configuration, see [sd_notify(3)]. The server should be running
-// as a systemd unit with "Type=notify" or "Type=notify-reload" (see
-// [systemd.service(5)]).
-//
-// notifyReloading returns a callback that must be called after reloading completes
-// (either successfully or unsuccessfully) to send [notifyReady].
-//
-// [sd_notify(3)]: https://www.freedesktop.org/software/systemd/man/latest/sd_notify.html#RELOADING=1
-// [systemd.service(5)]: https://www.freedesktop.org/software/systemd/man/latest/systemd.service.html#Type=
-func notifyReloading() (done func()) {
-	sent, _ := systemdDaemon.SdNotify(false, systemdDaemon.SdNotifyReloading+"\n"+systemdDaemon.SdNotifyMonotonicUsec())
-	if !sent {
-		// Nothing to do if no reloading event was sent.
-		return func() {}
-	}
-	return notifyReady
-}
-
 func validateCPURealtimeOptions(cfg *config.Config) error {
 	if cfg.CPURealtimePeriod == 0 && cfg.CPURealtimeRuntime == 0 {
 		return nil
diff --git a/daemon/command/daemon_windows.go b/daemon/command/daemon_windows.go
@@ -56,10 +56,6 @@ func preNotifyReady() error {
 func notifyReady() {
 }
 
-// notifyReloading sends a message to the host when the server got signaled to
-// reloading its configuration. It is a no-op on Windows.
-func notifyReloading() func() { return func() {} }
-
 // notifyStopping sends a message to the host when the server is shutting down
 func notifyStopping() {
 }

Original file line number	Diff line number	Diff line change
`@@ -531,13 +531,6 @@ func (cli *daemonCLI) reloadConfig() {`
`531`	`531`	`}`
`532`	`532`	`}`
`533`	`533`
`534`		`- // On Linux, we use sd_notify to indicate we're reloading config. We send`
`535`		`- // this signal as early as possible to let systemd know we're reloading,`
`536`		`- // but must signal "ready" after this completes (even on failure), which`
`537`		`- // is done by the reload function defined above.`
`538`		`- done := notifyReloading()`
`539`		`- defer done()`
`540`		`-`
`541`	`534`	`if err := config.Reload(*cli.configFile, cli.flags, reload); err != nil {`
`542`	`535`	`log.G(ctx).WithError(err).Error("Error reloading configuration")`
`543`	`536`	`return`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,6 @@ func preNotifyReady() error {`
`11`	`11`	`func notifyReady() {`
`12`	`12`	`}`
`13`	`13`
`14`		`-// notifyReloading sends a message to the host when the server got signaled to`
`15`		`-// reloading its configuration. It is a no-op on FreeBSD.`
`16`		`-func notifyReloading() func() { return func() {} }`
`17`		`-`
`18`	`14`	`// notifyStopping sends a message to the host when the server is shutting down`
`19`	`15`	`func notifyStopping() {`
`20`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,6 @@ func preNotifyReady() error {`
`56`	`56`	`func notifyReady() {`
`57`	`57`	`}`
`58`	`58`
`59`		`-// notifyReloading sends a message to the host when the server got signaled to`
`60`		`-// reloading its configuration. It is a no-op on Windows.`
`61`		`-func notifyReloading() func() { return func() {} }`
`62`		`-`
`63`	`59`	`// notifyStopping sends a message to the host when the server is shutting down`
`64`	`60`	`func notifyStopping() {`
`65`	`61`	`}`