Merge branch '309-run-without-pools' into 'master'

agneum · agneum · commit eb4f5a431119 · 2021-12-14T02:00:33.000Z
feat: start DLE and Local UI even if no data pool available (#309)

See merge request postgres-ai/database-lab!393
diff --git a/cmd/database-lab/main.go b/cmd/database-lab/main.go
@@ -81,12 +81,6 @@ func main() {
 
 	runner := runners.NewLocalRunner(cfg.Provision.UseSudo)
 
-	pm := pool.NewPoolManager(&cfg.PoolManager, runner)
-	if err = pm.ReloadPools(); err != nil {
-		log.Err(err.Error())
-		return
-	}
-
 	internalNetworkID, err := networks.Setup(ctx, docker, engProps.InstanceID, engProps.ContainerName)
 	if err != nil {
 		log.Errf(err.Error())
@@ -107,21 +101,17 @@ func main() {
 		DBName:   cfg.Global.Database.Name(),
 	}
 
-	emergencyShutdown := func() {
-		cancel()
-
-		shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), shutdownTimeout)
-		defer shutdownCancel()
-
-		shutdownDatabaseLabEngine(shutdownCtx, docker, engProps, pm.First().Pool())
-	}
-
 	tm, err := telemetry.New(cfg.Global, engProps)
 	if err != nil {
 		log.Errf(errors.WithMessage(err, "failed to initialize a telemetry service").Error())
 		return
 	}
 
+	pm := pool.NewPoolManager(&cfg.PoolManager, runner)
+	if err = pm.ReloadPools(); err != nil {
+		log.Err(err.Error())
+	}
+
 	// Create a new retrieval service to prepare a data directory and start snapshotting.
 	retrievalSvc := retrieval.New(cfg, engProps, docker, pm, tm, runner)
 
@@ -133,6 +123,15 @@ func main() {
 
 	observingChan := make(chan string, 1)
 
+	emergencyShutdown := func() {
+		cancel()
+
+		shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), shutdownTimeout)
+		defer shutdownCancel()
+
+		shutdownDatabaseLabEngine(shutdownCtx, docker, engProps, pm.First())
+	}
+
 	cloningSvc := cloning.NewBase(&cfg.Cloning, provisioner, tm, observingChan)
 	if err = cloningSvc.Run(ctx); err != nil {
 		log.Err(err)
@@ -193,7 +192,7 @@ func main() {
 		log.Msg(err)
 	}
 
-	shutdownDatabaseLabEngine(shutdownCtx, docker, engProps, pm.First().Pool())
+	shutdownDatabaseLabEngine(shutdownCtx, docker, engProps, pm.First())
 	cloningSvc.SaveClonesState()
 	tm.SendEvent(context.Background(), telemetry.EngineStoppedEvent, telemetry.EngineStopped{Uptime: server.Uptime()})
 }
@@ -292,11 +291,13 @@ func setShutdownListener() chan os.Signal {
 	return c
 }
 
-func shutdownDatabaseLabEngine(ctx context.Context, dockerCLI *client.Client, engProps global.EngineProps, fsp *resources.Pool) {
+func shutdownDatabaseLabEngine(ctx context.Context, dockerCLI *client.Client, engProps global.EngineProps, fsm pool.FSManager) {
 	log.Msg("Stopping auxiliary containers")
 
-	if err := cont.StopControlContainers(ctx, dockerCLI, engProps.InstanceID, fsp.DataDir()); err != nil {
-		log.Err("Failed to stop control containers", err)
+	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.CleanUpSatelliteContainers(ctx, dockerCLI, engProps.InstanceID); err != nil {
diff --git a/internal/provision/mode_local.go b/internal/provision/mode_local.go
@@ -39,6 +39,7 @@ import (
 const (
 	maxNumberOfPortsToCheck = 5
 	portCheckingTimeout     = 3 * time.Second
+	unknownVersion          = "unknown"
 )
 
 // PortPool describes an available port range for clones.
@@ -723,7 +724,12 @@ func (p *Provisioner) StartCloneContainer(ctx context.Context, containerName str
 
 // DetectDBVersion detects version of the database.
 func (p *Provisioner) DetectDBVersion() string {
-	pgVersion, err := tools.DetectPGVersion(p.pm.First().Pool().DataDir())
+	fsManager := p.pm.First()
+	if fsManager == nil {
+		return unknownVersion
+	}
+
+	pgVersion, err := tools.DetectPGVersion(fsManager.Pool().DataDir())
 	if err != nil {
 		return parseImageVersion(p.config.DockerImage)
 	}
diff --git a/internal/retrieval/retrieval.go b/internal/retrieval/retrieval.go
@@ -137,6 +137,7 @@ func (r *Retrieval) Run(ctx context.Context) error {
 			Level:   models.RefreshFailed,
 			Message: "Pool to perform data refresh not found",
 		}
+		r.State.Status = models.Failed
 		r.State.addAlert(alert)
 		r.tm.SendEvent(ctx, telemetry.AlertEvent, alert)
 

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,7 @@ func (r *Retrieval) Run(ctx context.Context) error {`
`137`	`137`	`Level: models.RefreshFailed,`
`138`	`138`	`Message: "Pool to perform data refresh not found",`
`139`	`139`	`}`
	`140`	`+ r.State.Status = models.Failed`
`140`	`141`	`r.State.addAlert(alert)`
`141`	`142`	`r.tm.SendEvent(ctx, telemetry.AlertEvent, alert)`
`142`	`143`