Merge branch '230-dle-configuration' into 'master'

agneum · agneum · commit fc1817cfaa37 · 2021-01-29T06:52:12.000Z
fix: DLE restore configuration (#230) # Description - add recovery_target_timeline (PG < 12) to handle a failover properly in Postgres 11 and older(see the related issue) - skip an error due to absent `postgresql.conf` while init DLE configs. The absence of the `postgresql.conf` file is normal at the first start because it will be initialized a little later - correct the path of the recovery file Closes #230 See merge request postgres-ai/database-lab!247
diff --git a/pkg/retrieval/engine/postgres/physical/custom.go b/pkg/retrieval/engine/postgres/physical/custom.go
@@ -41,6 +41,7 @@ func (c *custom) GetRecoveryConfig(pgVersion float64) map[string]string {
 
 		if pgVersion < defaults.PGVersion12 {
 			recoveryCfg["standby_mode"] = "on"
+			recoveryCfg["recovery_target_timeline"] = "latest"
 		}
 	}
 
diff --git a/pkg/retrieval/engine/postgres/physical/custom_test.go b/pkg/retrieval/engine/postgres/physical/custom_test.go
@@ -13,8 +13,9 @@ func TestCustomRecoveryConfig(t *testing.T) {
 
 	recoveryConfig := customTool.GetRecoveryConfig(11.7)
 	expectedResponse11 := map[string]string{
-		"restore_command": "pg_basebackup -X stream -D dataDirectory",
-		"standby_mode":    "on",
+		"restore_command":          "pg_basebackup -X stream -D dataDirectory",
+		"standby_mode":             "on",
+		"recovery_target_timeline": "latest",
 	}
 	assert.Equal(t, expectedResponse11, recoveryConfig)
 
diff --git a/pkg/retrieval/engine/postgres/physical/wal_g.go b/pkg/retrieval/engine/postgres/physical/wal_g.go
@@ -44,6 +44,7 @@ func (w *walg) GetRecoveryConfig(pgVersion float64) map[string]string {
 
 	if pgVersion < defaults.PGVersion12 {
 		recoveryCfg["standby_mode"] = "on"
+		recoveryCfg["recovery_target_timeline"] = "latest"
 	}
 
 	return recoveryCfg
diff --git a/pkg/retrieval/engine/postgres/physical/wal_g_test.go b/pkg/retrieval/engine/postgres/physical/wal_g_test.go
@@ -11,8 +11,9 @@ func TestWALGRecoveryConfig(t *testing.T) {
 
 	recoveryConfig := walg.GetRecoveryConfig(11.7)
 	expectedResponse11 := map[string]string{
-		"restore_command": "wal-g wal-fetch %f %p",
-		"standby_mode":    "on",
+		"restore_command":          "wal-g wal-fetch %f %p",
+		"standby_mode":             "on",
+		"recovery_target_timeline": "latest",
 	}
 	assert.Equal(t, expectedResponse11, recoveryConfig)
 
diff --git a/pkg/services/provision/databases/postgres/pgconfig/configuration.go b/pkg/services/provision/databases/postgres/pgconfig/configuration.go
@@ -146,6 +146,10 @@ func (m *Manager) isInitialized() (bool, error) {
 
 	postgresFile, err := os.Open(pgConfDst)
 	if err != nil {
+		if _, ok := err.(*os.PathError); ok {
+			return false, nil
+		}
+
 		return false, err
 	}
 
@@ -303,6 +307,10 @@ func (m *Manager) AdjustRecoveryFiles() error {
 
 // ApplyRecovery applies recovery configuration parameters.
 func (m *Manager) ApplyRecovery(cfg map[string]string) error {
+	if err := tools.TouchFile(path.Join(m.dataDir, m.recoveryFilename())); err != nil {
+		return err
+	}
+
 	if err := appendExtraConf(path.Join(m.dataDir, m.recoveryFilename()), cfg); err != nil {
 		return err
 	}
@@ -373,11 +381,11 @@ func (m *Manager) getConfigPath(configName string) string {
 
 // recoveryFilename returns the name of a recovery configuration file.
 func (m Manager) recoveryFilename() string {
-	if m.pgVersion > defaults.PGVersion12 {
+	if m.pgVersion >= defaults.PGVersion12 {
 		return configPrefix + pgConfName
 	}
 
-	return configPrefix + recoveryConfName
+	return recoveryConfName
 }
 
 // rewriteConfig completely rewrite a configuration file with provided parameters.

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ func (c *custom) GetRecoveryConfig(pgVersion float64) map[string]string {`
`41`	`41`
`42`	`42`	`if pgVersion < defaults.PGVersion12 {`
`43`	`43`	`recoveryCfg["standby_mode"] = "on"`
	`44`	`+ recoveryCfg["recovery_target_timeline"] = "latest"`
`44`	`45`	`}`
`45`	`46`	`}`
`46`	`47`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ func (w *walg) GetRecoveryConfig(pgVersion float64) map[string]string {`
`44`	`44`
`45`	`45`	`if pgVersion < defaults.PGVersion12 {`
`46`	`46`	`recoveryCfg["standby_mode"] = "on"`
	`47`	`+ recoveryCfg["recovery_target_timeline"] = "latest"`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`return recoveryCfg`