Commit d38b21b

committed

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

fix: stop Postgres after logical restore (#271): Closes #271 See merge request postgres-ai/database-lab!305

2 parents 3b5e5a6 + 09ff0a4 commit d38b21bCopy full SHA for d38b21b

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -333,6 +333,10 @@ func (d *DumpJob) Run(ctx context.Context) (err error) {`
`333`	`333`	`if err := tools.ExecCommand(ctx, d.dockerClient, dumpCont.ID, types.ExecConfig{Cmd: analyzeCmd}); err != nil {`
`334`	`334`	`return errors.Wrap(err, "failed to recalculate statistics after restore")`
`335`	`335`	`}`
	`336`	`+`
	`337`	`+ if err := tools.StopPostgres(ctx, d.dockerClient, dumpCont.ID, dataDir, tools.DefaultStopTimeout); err != nil {`
	`338`	`+ return errors.Wrap(err, "failed to stop Postgres instance")`
	`339`	`+ }`
`336`	`340`	`}`
`337`	`341`
`338`	`342`	`log.Msg("Dumping job has been finished")`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,10 @@ func (r *RestoreJob) Run(ctx context.Context) (err error) {`
`221`	`221`	`return errors.Wrap(err, "failed to recalculate statistics after restore")`
`222`	`222`	`}`
`223`	`223`
	`224`	`+ if err := tools.StopPostgres(ctx, r.dockerClient, restoreCont.ID, dataDir, tools.DefaultStopTimeout); err != nil {`
	`225`	`+ return errors.Wrap(err, "failed to stop Postgres instance")`
	`226`	`+ }`
	`227`	`+`
`224`	`228`	`log.Msg("Restoring job has been finished")`
`225`	`229`
`226`	`230`	`return nil`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -632,9 +632,7 @@ func (p *PhysicalInitial) promoteInstance(ctx context.Context, clonePath string,`
`632`	`632`	`return errors.Wrap(err, "failed to store prepared configuration")`
`633`	`633`	`}`
`634`	`634`
`635`		`- const pgStopTimeout = 600`
`636`		`-`
`637`		`- if err := tools.StopPostgres(ctx, p.dockerClient, promoteCont.ID, clonePath, pgStopTimeout); err != nil {`
	`635`	`+ if err := tools.StopPostgres(ctx, p.dockerClient, promoteCont.ID, clonePath, tools.DefaultStopTimeout); err != nil {`
`638`	`636`	`log.Msg("Failed to stop Postgres", err)`
`639`	`637`	`tools.PrintContainerLogs(ctx, p.dockerClient, promoteCont.ID)`
`640`	`638`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ const (`
`41`	`41`	`essentialLogsInterval = "10s"`
`42`	`42`
`43`	`43`	`// DefaultStopTimeout defines the default timeout for Postgres stop.`
`44`		`- DefaultStopTimeout = 60`
	`44`	`+ DefaultStopTimeout = 600`
`45`	`45`
`46`	`46`	`// ViewLogsCmd tells the command to view docker container logs.`
`47`	`47`	`ViewLogsCmd = "docker logs --since 1m -f"`

Comments

(0)