mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pg_upgrade: include additional detail in cluster check

Browse Source 
When the cluster failed the pg_controldata check for clean shut
down we only reported that it did so, not why. The state of the
cluster can be important information when diagnosing the failed
upgrade attempt, so instead include it in the error message.

Discussion: https://postgr.es/m/E0D5EA16-A085-4753-8DDC-C7055048B439@yesql.se
This commit is contained in:
Daniel Gustafsson 2023-07-20 14:55:50 +02:00
parent 3c152a27b0
commit a3f695e645
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/pg_upgrade/controldata.c
View File

@ -149,22 +149,23 @@ get_control_data(ClusterInfo *cluster, bool live_check)
* the server was shut down cleanly, from the controldata
* perspective.
*/
/* remove leading spaces */
/* Remove trailing newline and leading spaces */
(void) pg_strip_crlf(p);
while (*p == ' ')
p++;
if (strcmp(p, "shut down in recovery\n") == 0)
if (strcmp(p, "shut down in recovery") == 0)
{
if (cluster == &old_cluster)
pg_fatal("The source cluster was shut down while in recovery mode. To upgrade, use \"rsync\" as documented or shut it down as a primary.");
else
pg_fatal("The target cluster was shut down while in recovery mode. To upgrade, use \"rsync\" as documented or shut it down as a primary.");
}
else if (strcmp(p, "shut down\n") != 0)
else if (strcmp(p, "shut down") != 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;
}