[datastore] Stop crons on ctx's cancels, cancel ctx when error occur during RunHTTPServer

Author: the-glu

cmds/core-service/main.go

@@ -164,22 +164,27 @@ func RunHTTPServer(ctx context.Context, ctxCanceler func(), address, locality st
 		versioningV1Server = &versioning.Server{}
 	)
 
+	ctx, ctxCancel := context.WithCancel(ctx)
+
 	// Initialize aux
 	auxV1Server, err = createAuxServer(ctx, locality, *publicEndpoint, *scdGlobalLock, logger)
 	if err != nil {
+		ctxCancel()
 		return stacktrace.Propagate(err, "Failed to create aux server")
 	}
 
 	// Initialize remote ID
 	ridV1Server, ridV2Server, err = createRIDServers(ctx, locality, logger)
 	if err != nil {
+		ctxCancel()
 		return stacktrace.Propagate(err, "Failed to create remote ID server")
 	}
 
 	// Initialize access token validation
 	keyResolver, err := createKeyResolver()
 	switch {
 	case err != nil:
+		ctxCancel()
 		return stacktrace.Propagate(err, "Error creating RSA authorizer")
 	case keyResolver == nil:
 		logger.Warn("operating without authorizing interceptor")
@@ -193,6 +198,7 @@ func RunHTTPServer(ctx context.Context, ctxCanceler func(), address, locality st
 		},
 	)
 	if err != nil {
+		ctxCancel()
 		return stacktrace.Propagate(err, "Error creating RSA authorizer")
 	}
 
@@ -212,6 +218,7 @@ func RunHTTPServer(ctx context.Context, ctxCanceler func(), address, locality st
 	if *enableSCD {
 		scdV1Server, err = createSCDServer(ctx, logger)
 		if err != nil {
+			ctxCancel()
 			return stacktrace.Propagate(err, "Failed to create strategic conflict detection server")
 		}
 
@@ -265,11 +272,13 @@ func RunHTTPServer(ctx context.Context, ctxCanceler func(), address, locality st
 	// Indicate ready for container health checks
 	readyFile, err := os.Create("service.ready")
 	if err != nil {
+		ctxCancel()
 		return stacktrace.Propagate(err, "Error touching file to indicate service ready")
 	}
 
 	err = readyFile.Close()
 	if err != nil {
+		ctxCancel()
 		return stacktrace.Propagate(err, "Error closing touched file to indicate service ready")
 	}
 

pkg/datastoreutils/dial.go

@@ -58,6 +58,11 @@ func DialStore[S any](ctx context.Context, dbName string, withCheckCron bool, ne
 			return zero, stacktrace.Propagate(err, "Failed to schedule db check for %s", dbName)
 		}
 		c.Start()
+
+		go func() {
+			<-ctx.Done()
+			c.Stop()
+		}()
 	}
 
 	return s, nil