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

pg_upgrade: fix shutdown check for standby servers

Browse Source 
Commit 244142d32afd02e7408a2ef1f249b00393983822 only tested for the
pg_controldata output for primary servers, but standby servers have
different "Database cluster state" output, so check for that too.

Diagnosed-by: Michael Paquier

Discussion: https://postgr.es/m/20180810164240.GM13638@paquier.xyz

Backpatch-through: 9.3
This commit is contained in:
Bruce Momjian 2018-08-14 17:19:02 -04:00
parent c6eedb4d86
commit 995133410d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,7 +150,8 @@ get_control_data(ClusterInfo *cluster, bool live_check)
/* remove leading spaces */ /* remove leading spaces */
while (*p == ' ') while (*p == ' ')
p++; p++;
if (strcmp(p, "shut down\n") != 0) if (strcmp(p, "shut down\n") != 0 &&
strcmp(p, "shut down in recovery\n") != 0)
{ {
if (cluster == &old_cluster) if (cluster == &old_cluster)
pg_fatal("The source cluster was not shut down cleanly.\n"); pg_fatal("The source cluster was not shut down cleanly.\n");