Merge branch 'nik-3-5-fix-recovery-conf-filename' into 'master'

NikolayS · NikolayS · commit 98bf221c27ad · 2024-11-20T04:56:40.000Z
fix: use built recovery config instead of original one

See merge request postgres-ai/database-lab!929
diff --git a/engine/internal/retrieval/engine/postgres/snapshot/physical.go b/engine/internal/retrieval/engine/postgres/snapshot/physical.go
@@ -568,7 +568,7 @@ func (p *PhysicalInitial) promoteInstance(ctx context.Context, clonePath string,
 	if syState.Err != nil {
 		recoveryConfig = buildRecoveryConfig(recoveryFileConfig, p.options.Promotion.Recovery)
 
-		if err := cfgManager.ApplyRecovery(recoveryFileConfig); err != nil {
+		if err := cfgManager.ApplyRecovery(recoveryConfig); err != nil {
 			return errors.Wrap(err, "failed to apply recovery configuration")
 		}
 	} else if err := cfgManager.RemoveRecoveryConfig(); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -568,7 +568,7 @@ func (p *PhysicalInitial) promoteInstance(ctx context.Context, clonePath string,`
`568`	`568`	`if syState.Err != nil {`
`569`	`569`	`recoveryConfig = buildRecoveryConfig(recoveryFileConfig, p.options.Promotion.Recovery)`
`570`	`570`
`571`		`- if err := cfgManager.ApplyRecovery(recoveryFileConfig); err != nil {`
	`571`	`+ if err := cfgManager.ApplyRecovery(recoveryConfig); err != nil {`
`572`	`572`	`return errors.Wrap(err, "failed to apply recovery configuration")`
`573`	`573`	`}`
`574`	`574`	`} else if err := cfgManager.RemoveRecoveryConfig(); err != nil {`