16552: Fix warnings re wrong process signalling service readiness.
authorTom Clegg <tom@curii.com>
Thu, 30 Jun 2022 19:11:32 +0000 (15:11 -0400)
committerTom Clegg <tom@curii.com>
Thu, 30 Jun 2022 19:11:32 +0000 (15:11 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

lib/boot/service.go

index b27a7462288d34a2de85bffa988fbcc2eb3d8270..506407f4e8537a451ab47029ff5c7eeba55465dd 100644 (file)
@@ -47,7 +47,15 @@ func (runner runServiceCommand) Run(ctx context.Context, fail func(error), super
                super.waitShutdown.Add(1)
                go func() {
                        defer super.waitShutdown.Done()
-                       fail(super.RunProgram(ctx, super.tempdir, runOptions{env: []string{"ARVADOS_SERVICE_INTERNAL_URL=" + u.String()}}, binfile, runner.name, "-config", super.configfile))
+                       fail(super.RunProgram(ctx, super.tempdir, runOptions{
+                               env: []string{
+                                       "ARVADOS_SERVICE_INTERNAL_URL=" + u.String(),
+                                       // Child process should not
+                                       // try to tell systemd that we
+                                       // are ready.
+                                       "NOTIFY_SOCKET=",
+                               },
+                       }, binfile, runner.name, "-config", super.configfile))
                }()
        }
        return nil