opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

pg_upgrade: generate check error for left-over new tablespace 

Previously, if pg_upgrade failed, and the user recreated the cluster but
did not remove the new cluster tablespace directory, a later pg_upgrade
would fail since the new tablespace directory would already exists.
This adds error reporting for this during check.

Reported-by: Justin Pryzby

Discussion: https://postgr.es/m/20200925005531.GJ23631@telsasoft.com

Backpatch-through: 9.5
This commit is contained in:
Bruce Momjian 2020-10-15 19:33:36 -04:00
parent 72559438f9
commit 3c0471b5fd
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/bin/pg_upgrade/check.c
View File

@ -27,6 +27,7 @@ static void check_for_tables_with_oids(ClusterInfo *cluster);
static void check_for_reg_data_type_usage(ClusterInfo *cluster);
static void check_for_jsonb_9_4_usage(ClusterInfo *cluster);
static void check_for_pg_role_prefix(ClusterInfo *cluster);
static void check_for_new_tablespace_dir(ClusterInfo *new_cluster);
static char *get_canonical_locale_name(int category, const char *locale);
@ -187,6 +188,8 @@ check_new_cluster(void)
check_is_install_user(&new_cluster);
check_for_prepared_transactions(&new_cluster);
check_for_new_tablespace_dir(&new_cluster);
}
@ -527,6 +530,43 @@ create_script_for_cluster_analyze(char **analyze_script_file_name)
}
/*
* A previous run of pg_upgrade might have failed and the new cluster
* directory recreated, but they might have forgotten to remove
* the new cluster's tablespace directories. Therefore, check that
* new cluster tablespace directories do not already exist. If
* they do, it would cause an error while restoring global objects.
* This allows the failure to be detected at check time, rather than
* during schema restore.
*
* Note, v8.4 has no tablespace_suffix, which is fine so long as the
* version being upgraded *to* has a suffix, since it's not allowed
* to pg_upgrade from a version to the same version if tablespaces are
* in use.
*/
static void
check_for_new_tablespace_dir(ClusterInfo *new_cluster)
{
char new_tablespace_dir[MAXPGPATH];
prep_status("Checking for new cluster tablespace directories");
for (int tblnum = 0; tblnum < os_info.num_old_tablespaces; tblnum++)
{
struct stat statbuf;
snprintf(new_tablespace_dir, MAXPGPATH, "%s%s",
os_info.old_tablespaces[tblnum],
new_cluster->tablespace_suffix);
if (stat(new_tablespace_dir, &statbuf) == 0 || errno != ENOENT)
pg_fatal("new cluster tablespace directory already exists: \"%s\"\n",
new_tablespace_dir);
}
check_ok();
}
/*
* create_script_for_old_cluster_deletion()
*