From: Daniel Gustafsson <daniel@yesql.se>
Content-Type: multipart/mixed;
	boundary="Apple-Mail=_50AB9A62-D52D-4653-A30B-7EAE7294FCDD"
Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.3\))
Subject: Giving more detail in pg_upgrade errormessage
Message-Id: <E0D5EA16-A085-4753-8DDC-C7055048B439@yesql.se>
Date: Tue, 18 Jul 2023 16:59:32 +0200
To: PostgreSQL Hackers <pgsql-hackers@lists.postgresql.org>
Archived-At: <https://www.postgresql.org/message-id/E0D5EA16-A085-4753-8DDC-C7055048B439%40yesql.se>
Precedence: bulk


--Apple-Mail=_50AB9A62-D52D-4653-A30B-7EAE7294FCDD
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii

Looking at the upgrade question in [0] made me realize that we discard
potentially useful information for troubleshooting.  When we check if =
the
cluster is properly shut down we might as well include the status from
pg_controldata in the errormessage as per the trivial (but yet untested)
proposed diff.

Is there a reason not to be verbose here as users might copy/paste this =
output
when asking for help?

--
Daniel Gustafsson

[0] CACoPQdbQTysF=3DEKckyFNGTdpOdXXMEsf_2ACno+bcNqQCB5raA@mail.gmail.com


--Apple-Mail=_50AB9A62-D52D-4653-A30B-7EAE7294FCDD
Content-Disposition: attachment;
	filename=pg_upgrade_controldata.diff
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="pg_upgrade_controldata.diff"
Content-Transfer-Encoding: 7bit

diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
index 9071a6fd45..29f1153340 100644
--- a/src/bin/pg_upgrade/controldata.c
+++ b/src/bin/pg_upgrade/controldata.c
@@ -162,9 +162,9 @@ get_control_data(ClusterInfo *cluster, bool live_check)
 				else if (strcmp(p, "shut down\n") != 0)
 				{
 					if (cluster == &old_cluster)
-						pg_fatal("The source cluster was not shut down cleanly.");
+						pg_fatal("The source cluster was not shut down cleanly, state reported as: \"%s\"", p);
 					else
-						pg_fatal("The target cluster was not shut down cleanly.");
+						pg_fatal("The target cluster was not shut down cleanly, state reported as: \"%s\"", p);
 				}
 				got_cluster_state = true;
 			}

--Apple-Mail=_50AB9A62-D52D-4653-A30B-7EAE7294FCDD--