Commit33cb8ff

committed

Warn about tablespace creation in PGDATA

Also add warning to pg_upgradeReport by Josh Berkus

1 parent290713e commit33cb8ffCopy full SHA for 33cb8ff

File tree

+10

-0

lines changed

+10

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,12 @@ CreateTableSpace(CreateTableSpaceStmt *stmt)`
`288`	`288`	`errmsg("tablespace location \"%s\" is too long",`
`289`	`289`	`location)));`
`290`	`290`
	`291`	`+/* Warn if the tablespace is in the data directory. */`
	`292`	`+if (path_is_prefix_of_path(DataDir,location))`
	`293`	`+ereport(WARNING,`
	`294`	`+(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),`
	`295`	`+errmsg("tablespace location should not be inside the data directory")));`
	`296`	`+`
`291`	`297`	`/*`
`292`	`298`	`* Disallow creation of tablespaces named "pg_xxx"; we reserve this`
`293`	`299`	`* namespace for system purposes.`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -508,6 +508,10 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name)`
`508`	`508`	`canonicalize_path(old_tablespace_dir);`
`509`	`509`	`if (path_is_prefix_of_path(old_cluster_pgdata,old_tablespace_dir))`
`510`	`510`	`{`
	`511`	`+/* reproduce warning from CREATE TABLESPACE that is in the log */`
	`512`	`+pg_log(PG_WARNING,`
	`513`	`+"\nWARNING: user-defined tablespace locations should not be inside the data directory, e.g. %s\n",old_tablespace_dir);`
	`514`	`+`
`511`	`515`	`/* Unlink file in case it is left over from a previous run. */`
`512`	`516`	`unlink(*deletion_script_file_name);`
`513`	`517`	`pg_free(*deletion_script_file_name);`

Comments

(0)