Merge branch '347-scheduler-context' into 'master'

fix (engine) : avoid panicking with an empty scheduler context (#347)

Closes #347

See merge request postgres-ai/database-lab!546

Author: agneum

engine/cmd/database-lab/main.go

@@ -294,10 +294,8 @@ func setShutdownListener() chan os.Signal {
 func shutdownDatabaseLabEngine(ctx context.Context, dockerCLI *client.Client, engProps global.EngineProps, fsm pool.FSManager) {
 	log.Msg("Stopping auxiliary containers")
 
-	if fsm != nil {
-		if err := cont.StopControlContainers(ctx, dockerCLI, engProps.InstanceID, fsm.Pool().DataDir()); err != nil {
-			log.Err("Failed to stop control containers", err)
-		}
+	if err := cont.StopControlContainers(ctx, dockerCLI, engProps.InstanceID, fsm); err != nil {
+		log.Err("Failed to stop control containers", err)
 	}
 
 	if err := cont.CleanUpSatelliteContainers(ctx, dockerCLI, engProps.InstanceID); err != nil {

engine/internal/retrieval/engine/postgres/snapshot/physical.go

@@ -444,7 +444,9 @@ func (p *PhysicalInitial) startScheduler(ctx context.Context) {
 }
 
 func (p *PhysicalInitial) waitToStopScheduler() {
-	<-p.schedulerCtx.Done()
+	if p.schedulerCtx != nil {
+		<-p.schedulerCtx.Done()
+	}
 
 	if p.scheduler != nil {
 		log.Msg("Stop snapshot scheduler")

engine/internal/retrieval/engine/postgres/tools/cont/container.go

@@ -17,6 +17,7 @@ import (
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"
 
+	"gitlab.com/postgres-ai/database-lab/v3/internal/provision/pool"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/engine/postgres/tools"
 	"gitlab.com/postgres-ai/database-lab/v3/internal/retrieval/options"
 	"gitlab.com/postgres-ai/database-lab/v3/pkg/log"
@@ -63,7 +64,7 @@ const (
 // TODO(akartasov): Control container manager.
 
 // StopControlContainers stops control containers run by Database Lab Engine.
-func StopControlContainers(ctx context.Context, dockerClient *client.Client, instanceID, dataDir string) error {
+func StopControlContainers(ctx context.Context, dockerClient *client.Client, instanceID string, fsm pool.FSManager) error {
 	log.Msg("Stop control containers")
 
 	list, err := getContainerList(ctx, dockerClient, instanceID, getControlContainerFilters())
@@ -80,10 +81,10 @@ func StopControlContainers(ctx context.Context, dockerClient *client.Client, ins
 			continue
 		}
 
-		if shouldStopInternalProcess(controlLabel) {
+		if shouldStopInternalProcess(controlLabel) && fsm != nil {
 			log.Msg("Stopping control container: ", containerName)
 
-			if err := tools.StopPostgres(ctx, dockerClient, controlCont.ID, dataDir, tools.DefaultStopTimeout); err != nil {
+			if err := tools.StopPostgres(ctx, dockerClient, controlCont.ID, fsm.Pool().DataDir(), tools.DefaultStopTimeout); err != nil {
 				log.Msg("Failed to stop Postgres", err)
 				tools.PrintContainerLogs(ctx, dockerClient, controlCont.ID)