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

Add pg_upgrade check to make sure the user has full access permission in

Browse Source 
the current directory;  if not, throw an error.
This commit is contained in:
Bruce Momjian 2011-05-16 11:01:29 -04:00
parent 6c19bd96bc
commit bda27e502f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/pg_upgrade/exec.c
View File

@ -93,6 +93,11 @@ is_server_running(const char *datadir)
void void
verify_directories(void) verify_directories(void)
{ {
if (access(".", R_OK | W_OK | X_OK) != 0)
pg_log(PG_FATAL,
"You must have full access permissions in the current directory.\n");
prep_status("Checking old data directory (%s)", old_cluster.pgdata); prep_status("Checking old data directory (%s)", old_cluster.pgdata);
check_data_dir(old_cluster.pgdata); check_data_dir(old_cluster.pgdata);
check_ok(); check_ok();

4
contrib/pg_upgrade/pg_upgrade.c
View File

@ -155,17 +155,13 @@ setup(char *argv0, bool live_check)
/* no postmasters should be running */ /* no postmasters should be running */
if (!live_check && is_server_running(old_cluster.pgdata)) if (!live_check && is_server_running(old_cluster.pgdata))
{
pg_log(PG_FATAL, "There seems to be a postmaster servicing the old cluster.\n" pg_log(PG_FATAL, "There seems to be a postmaster servicing the old cluster.\n"
"Please shutdown that postmaster and try again.\n"); "Please shutdown that postmaster and try again.\n");
}
/* same goes for the new postmaster */ /* same goes for the new postmaster */
if (is_server_running(new_cluster.pgdata)) if (is_server_running(new_cluster.pgdata))
{
pg_log(PG_FATAL, "There seems to be a postmaster servicing the new cluster.\n" pg_log(PG_FATAL, "There seems to be a postmaster servicing the new cluster.\n"
"Please shutdown that postmaster and try again.\n"); "Please shutdown that postmaster and try again.\n");
}
/* get path to pg_upgrade executable */ /* get path to pg_upgrade executable */
if (find_my_exec(argv0, exec_path) < 0) if (find_my_exec(argv0, exec_path) < 0)