Revert "Add replication_mode parameter in recovery.conf."

This reverts commit 3293dd5337a258a00e1a65936e1e4d18a886e078.

This is for moving replication_mode from recovery.conf to
postgresql.conf.

diff --git a/src/backend/access/transam/recovery.conf.sample b/src/backend/access/transam/recovery.conf.sample
index e7eec34..722c7d6 100644 (file)
--- a/src/backend/access/transam/recovery.conf.sample
+++ b/src/backend/access/transam/recovery.conf.sample
@@ -100,10 +100,6 @@
 #primary_conninfo = ''         # e.g. 'host=localhost port=5432'
 #
 #
-# Specifies the synchronization mode of replication.
-#replication_mode = 'async'             # 'async', 'recv', 'fsync' or 'apply'
-#
-#
 # By default, a standby server keeps streaming XLOG records from the
 # primary indefinitely. If you want to stop streaming and finish recovery,
 # opening up the system in read/write mode, specify path to a trigger file.

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 23d878a..25a384b 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -5283,17 +5283,6 @@ readRecoveryCommandFile(void)
                                        (errmsg("trigger_file = '%s'",
                                                        TriggerFile)));
                }
-               else if (strcmp(tok1, "replication_mode") == 0)
-               {
-                       rplMode = ReplicationModeNameGetValue(tok2);
-                       if (rplMode == InvalidReplicationMode)
-                               ereport(FATAL,
-                                               (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                                errmsg("invalid value for parameter \"replication_mode\": \"%s\"",
-                                                               tok2)));
-                       ereport(DEBUG2,
-                                       (errmsg("replication_mode = '%s'", tok2)));
-               }
                else
                        ereport(FATAL,
                                        (errmsg("unrecognized recovery parameter \"%s\"",