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

agneum · agneum · commit bd6f6f6cfc32 · 2021-02-05T13:51:28.000Z
diff --git a/configs/config.example.physical_generic.yml b/configs/config.example.physical_generic.yml
@@ -178,7 +178,7 @@ retrieval:
           # complicated snippet, create a shell script, use --mount (-v) option
           # when starting a container with Database Lab and use path to it here.
           # Write your data to dataDir defined in "global.config"
-          command: "pg_basebackup -X stream -D /var/lib/dblab/data"
+          command: "pg_basebackup -X stream -D /var/lib/dblab/dblab_pool/data"
 
           # PostgreSQL "restore_command" configuration option.
           restore_command: ""
diff --git a/pkg/services/provision/databases/postgres/pgconfig/configuration.go b/pkg/services/provision/databases/postgres/pgconfig/configuration.go
@@ -296,17 +296,21 @@ func (m *Manager) AdjustRecoveryFiles() error {
 		return errors.Wrap(err, "failed to truncate pg_ident.conf")
 	}
 
+	return nil
+}
+
+// ApplyRecovery applies recovery configuration parameters.
+func (m *Manager) ApplyRecovery(cfg map[string]string) error {
+	if len(cfg) == 0 {
+		return nil
+	}
+
 	if m.pgVersion >= defaults.PGVersion12 {
 		if err := tools.TouchFile(path.Join(m.dataDir, "standby.signal")); err != nil {
 			return err
 		}
 	}
 
-	return nil
-}
-
-// 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
 	}
