pg_upgrade: start/stop new server after pg_resetwal

When commit 0f33a719fdbb5d8c43839ea0d2c90cd03e2af2d2 removed the
instructions to start/stop the new cluster before running rsync, it was
now possible for pg_resetwal/pg_resetxlog to leave the final WAL record
at wal_level=minimum, preventing upgraded standby servers from
reconnecting.

This patch fixes that by having pg_upgrade unconditionally start/stop
the new cluster after pg_resetwal/pg_resetxlog has run.

Backpatch through 9.2 since, though the instructions were added in PG
9.5, they worked all the way back to 9.2.

Discussion: https://postgr.es/m/20170620171844[email protected]

Backpatch-through: 9.2

diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index a3ee116a8cdedb5d78d29173ac228b4e5d518313..a26e55ca7fbfde728855ee9dcd4cb5ee6776e0cc 100644 (file)
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -164,15 +164,21 @@ report_clusters_compatible(void)
 
 
 void
-issue_warnings(void)
+issue_warnings_and_set_wal_level(void)
 {
+   /*
+    * We unconditionally start/stop the new server because pg_resetwal -o
+    * set wal_level to 'minimum'.  If the user is upgrading standby
+    * servers using the rsync instructions, they will need pg_upgrade
+    * to write its final WAL record showing wal_level as 'replica'.
+    */
+   start_postmaster(&new_cluster, true);
+
    /* Create dummy large object permissions for old < PG 9.0? */
    if (GET_MAJOR_VERSION(old_cluster.major_version) <= 804)
-   {
-       start_postmaster(&new_cluster, true);
        new_9_0_populate_pg_largeobject_metadata(&new_cluster, false);
-       stop_postmaster(false);
-   }
+
+   stop_postmaster(false);
 }
 
 

diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c
index 90c07205bf837dfba398ebf3b390631cc16d8503..710b8efb874e6eca5247d051ed0ca3835df59b16 100644 (file)
--- a/src/bin/pg_upgrade/pg_upgrade.c
+++ b/src/bin/pg_upgrade/pg_upgrade.c
@@ -160,7 +160,7 @@ main(int argc, char **argv)
    create_script_for_cluster_analyze(&analyze_script_file_name);
    create_script_for_old_cluster_deletion(&deletion_script_file_name);
 
-   issue_warnings();
+   issue_warnings_and_set_wal_level();
 
    pg_log(PG_REPORT, "\nUpgrade Complete\n");
    pg_log(PG_REPORT, "----------------\n");

diff --git a/src/bin/pg_upgrade/pg_upgrade.h b/src/bin/pg_upgrade/pg_upgrade.h
index 19dca83386ff815a66a1c11a3e47143f1456d27f..439552c5da728d6a4ceef1da16b467be7b1efeca 100644 (file)
--- a/src/bin/pg_upgrade/pg_upgrade.h
+++ b/src/bin/pg_upgrade/pg_upgrade.h
@@ -334,7 +334,7 @@ void        output_check_banner(bool live_check);
 void       check_and_dump_old_cluster(bool live_check);
 void       check_new_cluster(void);
 void       report_clusters_compatible(void);
-void       issue_warnings(void);
+void       issue_warnings_and_set_wal_level(void);
 void output_completion_banner(char *analyze_script_file_name,
                         char *deletion_script_file_name);
 void       check_cluster_versions(void);