database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Have pg_upgrade create its output files in the current directory, rather

Browse Source 
than in a subdirectory of the $HOME directory, or $TMP in Windows.
This commit is contained in:
Bruce Momjian
2010-06-12 17:05:29 +00:00
parent 99fdb4a9ea
commit 1dc7c796c9
8 changed files with 21 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
contrib/pg_upgrade/pg_upgrade.c
View File

@ -18,7 +18,6 @@ static void copy_clog_xlog_xid(migratorContext *ctx);
static void set_frozenxids(migratorContext *ctx);
static void setup(migratorContext *ctx, char *argv0, bool live_check);
static void cleanup(migratorContext *ctx);
static void create_empty_output_directory(migratorContext *ctx);
int
@ -37,8 +36,6 @@ main(int argc, char **argv)
setup(&ctx, argv[0], live_check);
create_empty_output_directory(&ctx);
check_cluster_versions(&ctx);
check_cluster_compatibility(&ctx, live_check);
@ -201,7 +198,7 @@ prepare_new_databases(migratorContext *ctx)
exec_prog(ctx, true,
SYSTEMQUOTE "\"%s/psql\" --set ON_ERROR_STOP=on --port %d "
"-f \"%s/%s\" --dbname template1 >> \"%s\"" SYSTEMQUOTE,
ctx->new.bindir, ctx->new.port, ctx->output_dir,
ctx->new.bindir, ctx->new.port, ctx->cwd,
GLOBALS_DUMP_FILE, ctx->logfile);
check_ok(ctx);
@ -223,7 +220,7 @@ create_new_objects(migratorContext *ctx)
exec_prog(ctx, true,
SYSTEMQUOTE "\"%s/psql\" --set ON_ERROR_STOP=on --port %d "
"-f \"%s/%s\" --dbname template1 >> \"%s\"" SYSTEMQUOTE,
ctx->new.bindir, ctx->new.port, ctx->output_dir,
ctx->new.bindir, ctx->new.port, ctx->cwd,
DB_DUMP_FILE, ctx->logfile);
check_ok(ctx);
@ -399,33 +396,10 @@ cleanup(migratorContext *ctx)
if (ctx->debug_fd)
fclose(ctx->debug_fd);
snprintf(filename, sizeof(filename), "%s/%s", ctx->output_dir, ALL_DUMP_FILE);
snprintf(filename, sizeof(filename), "%s/%s", ctx->cwd, ALL_DUMP_FILE);
unlink(filename);
snprintf(filename, sizeof(filename), "%s/%s", ctx->output_dir, GLOBALS_DUMP_FILE);
snprintf(filename, sizeof(filename), "%s/%s", ctx->cwd, GLOBALS_DUMP_FILE);
unlink(filename);
snprintf(filename, sizeof(filename), "%s/%s", ctx->output_dir, DB_DUMP_FILE);
snprintf(filename, sizeof(filename), "%s/%s", ctx->cwd, DB_DUMP_FILE);
unlink(filename);
}
/*
* create_empty_output_directory
*
* Create empty directory for output files
*/
static void
create_empty_output_directory(migratorContext *ctx)
{
/*
* rmtree() outputs a warning if the directory does not exist,
* so we try to create the directory first.
*/
if (mkdir(ctx->output_dir, S_IRWXU) != 0)
{
if (errno == EEXIST)
rmtree(ctx->output_dir, false);
else
pg_log(ctx, PG_FATAL, "Cannot create subdirectory %s: %s\n",
ctx->output_dir, getErrorText(errno));
}
}