Merge branch 'reorder-startup-services' into 'master'

fix: init provisioner after starting API server

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

Author: agneum

engine/cmd/database-lab/main.go

@@ -156,27 +156,9 @@ func main() {
 	}
 
 	obs := observer.NewObserver(docker, &cfg.Observer, pm)
-
-	go removeObservingClones(observingChan, obs)
-
-	systemMetrics := billing.GetSystemMetrics(pm)
-
-	tm.SendEvent(ctx, telemetry.EngineStartedEvent, telemetry.EngineStarted{
-		EngineVersion: version.GetVersion(),
-		DBEngine:      cfg.Global.Engine,
-		DBVersion:     provisioner.DetectDBVersion(),
-		Pools:         pm.CollectPoolStat(),
-		Restore:       retrievalSvc.ReportState(),
-		System:        systemMetrics,
-	})
-
 	billingSvc := billing.New(platformSvc.Client, &engProps, pm)
 
-	if err := billingSvc.RegisterInstance(ctx, systemMetrics); err != nil {
-		log.Msg("Skip registering instance:", err)
-	}
-
-	log.Msg("DLE Edition:", engProps.GetEdition())
+	go removeObservingClones(observingChan, obs)
 
 	embeddedUI := embeddedui.New(cfg.EmbeddedUI, engProps, runner, docker)
 
@@ -201,12 +183,6 @@ func main() {
 
 	server := srv.NewServer(&cfg.Server, &cfg.Global, &engProps, docker, cloningSvc, provisioner, retrievalSvc, platformSvc,
 		billingSvc, obs, pm, tm, tokenHolder, logFilter, embeddedUI, reloadConfigFn)
-	shutdownCh := setShutdownListener()
-
-	go setReloadListener(ctx, engProps, provisioner, billingSvc,
-		retrievalSvc, pm, cloningSvc, platformSvc,
-		embeddedUI, server,
-		logCleaner, logFilter)
 
 	server.InitHandlers()
 
@@ -216,8 +192,6 @@ func main() {
 		}
 	}()
 
-	go billingSvc.CollectUsage(ctx, systemMetrics)
-
 	if cfg.EmbeddedUI.Enabled {
 		go func() {
 			if err := embeddedUI.Run(ctx); err != nil {
@@ -227,6 +201,39 @@ func main() {
 		}()
 	}
 
+	if err := provisioner.Init(); err != nil {
+		log.Err(err)
+		emergencyShutdown()
+
+		return
+	}
+
+	systemMetrics := billing.GetSystemMetrics(pm)
+
+	tm.SendEvent(ctx, telemetry.EngineStartedEvent, telemetry.EngineStarted{
+		EngineVersion: version.GetVersion(),
+		DBEngine:      cfg.Global.Engine,
+		DBVersion:     provisioner.DetectDBVersion(),
+		Pools:         pm.CollectPoolStat(),
+		Restore:       retrievalSvc.ReportState(),
+		System:        systemMetrics,
+	})
+
+	if err := billingSvc.RegisterInstance(ctx, systemMetrics); err != nil {
+		log.Msg("Skip registering instance:", err)
+	}
+
+	log.Msg("DBLab Edition:", engProps.GetEdition())
+
+	shutdownCh := setShutdownListener()
+
+	go setReloadListener(ctx, engProps, provisioner, billingSvc,
+		retrievalSvc, pm, cloningSvc, platformSvc,
+		embeddedUI, server,
+		logCleaner, logFilter)
+
+	go billingSvc.CollectUsage(ctx, systemMetrics)
+
 	if err := retrievalSvc.Run(ctx); err != nil {
 		log.Err("Failed to run the data retrieval service:", err)
 		log.Msg(contactSupport)

engine/internal/cloning/base.go

@@ -74,8 +74,8 @@ func (c *Base) Reload(cfg Config) {
 
 // Run initializes and runs cloning component.
 func (c *Base) Run(ctx context.Context) error {
-	if err := c.provision.Init(); err != nil {
-		return errors.Wrap(err, "failed to run cloning service")
+	if err := c.provision.RevisePortPool(); err != nil {
+		return fmt.Errorf("failed to revise port pool: %w", err)
 	}
 
 	if _, err := c.GetSnapshots(); err != nil {

engine/internal/provision/mode_local.go

@@ -128,10 +128,6 @@ func isValidConfigModeLocal(config Config) error {
 
 // Init inits provision.
 func (p *Provisioner) Init() error {
-	if err := p.RevisePortPool(); err != nil {
-		return fmt.Errorf("failed to revise port pool: %w", err)
-	}
-
 	if err := docker.PrepareImage(p.ctx, p.dockerClient, p.config.DockerImage); err != nil {
 		return fmt.Errorf("cannot prepare docker image %s: %w", p.config.DockerImage, err)
 	}