Commit bdd643c

committed

Merge branch 'nik-pgbackrest-delta-option' into 'master'

fix: pgBackRest – rename "forceInit" option to "delta" See merge request postgres-ai/database-lab!513

2 parents a37d8e1 + 7b25846 commit bdd643cCopy full SHA for bdd643c

File tree

-5

lines changed

-5

lines changed

Whitespace-only changes.

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ retrieval:`
`238`	`238`	`# Defines pgBackRest configuration options.`
`239`	`239`	`pgbackrest:`
`240`	`240`	`stanza: stanzaName`
`241`		`- forceInit: false`
	`241`	`+ delta: false`
`242`	`242`
`243`	`243`	`physicalSnapshot:`
`244`	`244`	`options:`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ type pgbackrest struct {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`type pgbackrestOptions struct {`
`23`		- Stanza string `yaml:"stanza"`
`24`		- ForceInitbool `yaml:"forceInit"`
	`23`	+ Stanza string `yaml:"stanza"`
	`24`	+ Deltabool `yaml:"delta"`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`func newPgBackRest(options pgbackrestOptions) *pgbackrest {`
`@@ -35,7 +35,7 @@ func (p *pgbackrest) GetRestoreCommand() string {`
`35`	`35`	`restoreCmd := fmt.Sprintf("sudo -Eu postgres pgbackrest --type=standby --pg1-path=${PGDATA} --stanza=%[1]s restore "+`
`36`	`36`	`"--recovery-option=restore_command='pgbackrest --pg1-path=${PGDATA} --stanza=%[1]s archive-get %%f %%p'", p.options.Stanza)`
`37`	`37`
`38`		`- if p.options.ForceInit {`
	`38`	`+ if p.options.Delta {`
`39`	`39`	`restoreCmd += " --delta"`
`40`	`40`	`}`
`41`	`41`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ func TestPgBackRestRestoreCommand(t *testing.T) {`
`31`	`31`	`"--recovery-option=restore_command='pgbackrest --pg1-path=${PGDATA} --stanza=stanzaName archive-get %f %p'"`
`32`	`32`	`assert.Equal(t, expectedResponse, restoreCmd)`
`33`	`33`
`34`		`- pgbackrest.options.ForceInit = true`
	`34`	`+ pgbackrest.options.Delta = true`
`35`	`35`	`restoreCmd = pgbackrest.GetRestoreCommand()`
`36`	`36`	`expectedResponse = "sudo -Eu postgres pgbackrest --type=standby --pg1-path=${PGDATA} --stanza=stanzaName restore " +`
`37`	`37`	`"--recovery-option=restore_command='pgbackrest --pg1-path=${PGDATA} --stanza=stanzaName archive-get %f %p' --delta"`

Comments

(0)