Merge branch '271-stop-postgres' into 'master'

fix: stop Postgres after logical restore (#271):

Closes #271

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

Author: agneum

pkg/retrieval/engine/postgres/logical/dump.go

@@ -333,6 +333,10 @@ func (d *DumpJob) Run(ctx context.Context) (err error) {
 		if err := tools.ExecCommand(ctx, d.dockerClient, dumpCont.ID, types.ExecConfig{Cmd: analyzeCmd}); err != nil {
 			return errors.Wrap(err, "failed to recalculate statistics after restore")
 		}
+
+		if err := tools.StopPostgres(ctx, d.dockerClient, dumpCont.ID, dataDir, tools.DefaultStopTimeout); err != nil {
+			return errors.Wrap(err, "failed to stop Postgres instance")
+		}
 	}
 
 	log.Msg("Dumping job has been finished")

pkg/retrieval/engine/postgres/logical/restore.go

@@ -221,6 +221,10 @@ func (r *RestoreJob) Run(ctx context.Context) (err error) {
 		return errors.Wrap(err, "failed to recalculate statistics after restore")
 	}
 
+	if err := tools.StopPostgres(ctx, r.dockerClient, restoreCont.ID, dataDir, tools.DefaultStopTimeout); err != nil {
+		return errors.Wrap(err, "failed to stop Postgres instance")
+	}
+
 	log.Msg("Restoring job has been finished")
 
 	return nil

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

@@ -632,9 +632,7 @@ func (p *PhysicalInitial) promoteInstance(ctx context.Context, clonePath string,
 		return errors.Wrap(err, "failed to store prepared configuration")
 	}
 
-	const pgStopTimeout = 600
-
-	if err := tools.StopPostgres(ctx, p.dockerClient, promoteCont.ID, clonePath, pgStopTimeout); err != nil {
+	if err := tools.StopPostgres(ctx, p.dockerClient, promoteCont.ID, clonePath, tools.DefaultStopTimeout); err != nil {
 		log.Msg("Failed to stop Postgres", err)
 		tools.PrintContainerLogs(ctx, p.dockerClient, promoteCont.ID)
 	}

pkg/retrieval/engine/postgres/tools/tools.go

@@ -41,7 +41,7 @@ const (
 	essentialLogsInterval = "10s"
 
 	// DefaultStopTimeout defines the default timeout for Postgres stop.
-	DefaultStopTimeout = 60
+	DefaultStopTimeout = 600
 
 	// ViewLogsCmd tells the command to view docker container logs.
 	ViewLogsCmd = "docker logs --since 1m -f"