Commitbd6f6f6

committed

fix: not to create recovery.conf/standby.signal files if recovery configuration is empty (#233)

1 parent70d9e7c commitbd6f6f6Copy full SHA for bd6f6f6

File tree

+10

-6

lines changed

+10

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ retrieval:`
`178`	`178`	`# complicated snippet, create a shell script, use --mount (-v) option`
`179`	`179`	`# when starting a container with Database Lab and use path to it here.`
`180`	`180`	`# Write your data to dataDir defined in "global.config"`
`181`		`-command:"pg_basebackup -X stream -D /var/lib/dblab/data"`
	`181`	`+command:"pg_basebackup -X stream -D /var/lib/dblab/dblab_pool/data"`
`182`	`182`
`183`	`183`	`# PostgreSQL "restore_command" configuration option.`
`184`	`184`	`restore_command:""`

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -296,17 +296,21 @@ func (m *Manager) AdjustRecoveryFiles() error {`
`296`	`296`	`returnerrors.Wrap(err,"failed to truncate pg_ident.conf")`
`297`	`297`	`}`
`298`	`298`
	`299`	`+returnnil`
	`300`	`+}`
	`301`	`+`
	`302`	`+// ApplyRecovery applies recovery configuration parameters.`
	`303`	`+func (m*Manager)ApplyRecovery(cfgmap[string]string)error {`
	`304`	`+iflen(cfg)==0 {`
	`305`	`+returnnil`
	`306`	`+}`
	`307`	`+`
`299`	`308`	`ifm.pgVersion>=defaults.PGVersion12 {`
`300`	`309`	`iferr:=tools.TouchFile(path.Join(m.dataDir,"standby.signal"));err!=nil {`
`301`	`310`	`returnerr`
`302`	`311`	`}`
`303`	`312`	`}`
`304`	`313`
`305`		`-returnnil`
`306`		`-}`
`307`		`-`
`308`		`-// ApplyRecovery applies recovery configuration parameters.`
`309`		`-func (m*Manager)ApplyRecovery(cfgmap[string]string)error {`
`310`	`314`	`iferr:=tools.TouchFile(path.Join(m.dataDir,m.recoveryFilename()));err!=nil {`
`311`	`315`	`returnerr`
`312`	`316`	`}`

Comments

(0)