Use wal_level=replica as hot_standby is deprecated

diff --git a/src/bin/pgxc_ctl/coord_cmd.c b/src/bin/pgxc_ctl/coord_cmd.c
index bbbbc9d47a8230ee9586059f714c59a872248822..27d8b3a542012adf4917f48767df2ba15fc53c68 100644 (file)
--- a/src/bin/pgxc_ctl/coord_cmd.c
+++ b/src/bin/pgxc_ctl/coord_cmd.c
@@ -158,7 +158,7 @@ cmd_t *prepare_initCoordinatorMaster(char *nodeName)
                fprintf(f, 
                                "#========================================\n"
                                "# Addition for log shipping, %s\n"
-                               "wal_level = hot_standby\n"
+                               "wal_level = replica\n"
                                "archive_mode = on\n"
                                "archive_command = 'rsync %%p %s@%s:%s/%%f'\n"
                                "max_wal_senders = %s\n"
@@ -318,8 +318,7 @@ cmd_t *prepare_initCoordinatorSlave(char *nodeName)
                        "#==========================================\n"
                        "# Added to initialize the slave, %s\n"
                        "standby_mode = on\n"
-                       "primary_conninfo = 'host = %s port = %s "
-                       "user = %s application_name = %s'\n"
+                       "primary_conninfo = 'host = %s port = %s user = %s application_name = %s'\n"
                        "restore_command = 'cp %s/%%f %%p'\n"
                        "archive_cleanup_command = 'pg_archivecleanup %s %%r'\n"
                        "# End of addition\n",
@@ -344,7 +343,7 @@ cmd_t *prepare_initCoordinatorSlave(char *nodeName)
                        "hot_standby = on\n"
                        "port = %s\n"
                        "pooler_port = %s\n"
-                       "wal_level = hot_standby\n"
+                       "wal_level = replica\n"
                        "archive_mode = off\n"
                        "archive_command = ''\n"
                        "max_wal_senders = 0\n"
@@ -1334,7 +1333,7 @@ int add_coordinatorSlave(char *name, char *host, int port, int pooler_port, char
        fprintf(f, 
                        "#========================================\n"
                        "# Addition for log shipping, %s\n"
-                       "wal_level = hot_standby\n"
+                       "wal_level = replica\n"
                        "archive_mode = on\n"
                        "archive_command = 'rsync %%p %s@%s:%s/%%f'\n"
                        "max_wal_senders = %d\n"
@@ -1438,7 +1437,7 @@ int add_coordinatorSlave(char *name, char *host, int port, int pooler_port, char
                        "hot_standby = on\n"
                        "port = %d\n"
                        "pooler_port = %d\n"
-                       "wal_level = hot_standby\n"
+                       "wal_level = replica\n"
                        "archive_mode = off\n"          /* No archive mode */
                        "archive_command = ''\n"        /* No archive mode */
                        "max_wal_senders = 0\n"         /* Minimum WAL senders */
@@ -1457,8 +1456,7 @@ int add_coordinatorSlave(char *name, char *host, int port, int pooler_port, char
                        "#==========================================\n"
                        "# Added to add the slave, %s\n"
                        "standby_mode = on\n"
-                       "primary_conninfo = 'host = %s port = %s "
-                       "user = %s application_name = %s'\n"
+                       "primary_conninfo = 'host = %s port = %s user = %s application_name = %s'\n"
                        "restore_command = 'cp %s/%%f %%p'\n"
                        "archive_cleanup_command = 'pg_archivecleanup %s %%r'\n"
                        "# End of addition\n",

diff --git a/src/bin/pgxc_ctl/datanode_cmd.c b/src/bin/pgxc_ctl/datanode_cmd.c
index a4c04b9e4ad24256864b6d48ba8ac69105f8c79f..94febf80a22594b98ad561f58553a803b943fb29 100644 (file)
--- a/src/bin/pgxc_ctl/datanode_cmd.c
+++ b/src/bin/pgxc_ctl/datanode_cmd.c
@@ -178,7 +178,7 @@ cmd_t *prepare_initDatanodeMaster(char *nodeName)
                        return(NULL);
                }
                fprintf(f,
-                               "wal_level = hot_standby\n"
+                               "wal_level = replica\n"
                                "archive_mode = on\n"
                                "archive_command = 'rsync %%p %s@%s:%s/%%f'\n"
                                "max_wal_senders = %s\n"
@@ -1399,7 +1399,7 @@ int add_datanodeSlave(char *name, char *host, int port, int pooler, char *dir,
        fprintf(f, 
                        "#========================================\n"
                        "# Addition for log shipping, %s\n"
-                       "wal_level = hot_standby\n"
+                       "wal_level = replica\n"
                        "archive_mode = on\n"
                        "archive_command = 'rsync %%p %s@%s:%s/%%f'\n"
                        "max_wal_senders = %d\n"
@@ -1517,7 +1517,7 @@ int add_datanodeSlave(char *name, char *host, int port, int pooler, char *dir,
                        "hot_standby = on\n"
                        "port = %s\n"
                        "pooler_port = %s\n"
-                       "wal_level = hot_standby\n"
+                       "wal_level = replica\n"
                        "archive_mode = off\n"          /* No archive mode */
                        "archive_command = ''\n"        /* No archive mode */
                        "max_wal_senders = 0\n"         /* Minimum WAL senders */
@@ -1534,8 +1534,7 @@ int add_datanodeSlave(char *name, char *host, int port, int pooler, char *dir,
                        "#==========================================\n"
                        "# Added to add the slave, %s\n"
                        "standby_mode = on\n"
-                       "primary_conninfo = 'host = %s port = %s "
-                       "user = %s application_name = %s'\n"
+                       "primary_conninfo = 'host = %s port = %s user = %s application_name = %s'\n"
                        "restore_command = 'cp %s/%%f %%p'\n"
                        "archive_cleanup_command = 'pg_archivecleanup %s %%r'\n"
                        "# End of addition\n",