fix: don't use a finished context for graceful shutdown

CHANGELOG.md

@@ -8,6 +8,7 @@
 1. [20349](https://github.com/influxdata/influxdb/pull/20349): Ensure `influxdb` service sees default env variables when running under `init.d`.
 1. [20317](https://github.com/influxdata/influxdb/pull/20317): Don't ignore failures to set password during initial user onboarding.
 1. [20362](https://github.com/influxdata/influxdb/pull/20362): Don't overwrite stack name/description on `influx stack update`.
+1. [20355](https://github.com/influxdata/influxdb/pull/20355): Fix timeout setup for `influxd` graceful shutdown.
 
 ## v2.0.3 [2020-12-14]
 

cmd/influxd/launcher/cmd.go

@@ -70,19 +70,20 @@ func cmdRunE(ctx context.Context, o *InfluxdOpts) func() error {
 	return func() error {
 		fluxinit.FluxInit()
 
-		// exit with SIGINT and SIGTERM
-		ctx = signals.WithStandardSignals(ctx)
-
 		l := NewLauncher()
-		if err := l.run(ctx, o); err != nil {
+
+		// Start the launcher and wait for it to exit on SIGINT or SIGTERM.
+		runCtx := signals.WithStandardSignals(ctx)
+		if err := l.run(runCtx, o); err != nil {
 			return err
 		}
-		<-ctx.Done()
+		<-runCtx.Done()
 
-		// Attempt clean shutdown.
-		ctx, cancel := context.WithTimeout(ctx, 2*time.Second)
+		// Tear down the launcher, allowing it a few seconds to finish any
+		// in-progress requests.
+		shutdownCtx, cancel := context.WithTimeout(ctx, 2*time.Second)
 		defer cancel()
-		l.Shutdown(ctx)
+		l.Shutdown(shutdownCtx)
 
 		return nil
 	}

cmd/influxd/launcher/launcher.go

@@ -167,7 +167,9 @@ func (m *Launcher) Engine() Engine {
 
 // Shutdown shuts down the HTTP server and waits for all services to clean up.
 func (m *Launcher) Shutdown(ctx context.Context) {
-	m.httpServer.Shutdown(ctx)
+	if err := m.httpServer.Shutdown(ctx); err != nil {
+		m.log.Error("Failed to close HTTP server", zap.Error(err))
+	}
 
 	m.log.Info("Stopping", zap.String("service", "task"))