github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-27 08:56:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

When the directory for a tablespace cannot be created or exists

Browse Source 
but is not empty, it was sending the message using dest_dir instead.
This commit is contained in:
Jaime Casanova
2010-10-05 21:15:35 -05:00
parent 61687855bb
commit 172caf8968
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
repmgr.c
View File

@@ -357,19 +357,22 @@ do_standby_clone(void)
} }
for (i = 0; i < PQntuples(res); i++) for (i = 0; i < PQntuples(res); i++)
{ {
char *tblspc_dir;
strcpy(tblspc_dir, PQgetvalues(res, i, 0));
/* Check this directory could be used as a PGDATA dir */ /* Check this directory could be used as a PGDATA dir */
switch (check_dir(PQgetvalue(res, i, 0))) switch (check_dir(tblspc_dir))
{ {
case 0: case 0:
/* dest_dir not there, must create it */ /* tblspc_dir not there, must create it */
if (verbose) if (verbose)
printf(_("creating directory \"%s\"... "), dest_dir); printf(_("creating directory \"%s\"... "), tblspc_dir);
fflush(stdout); fflush(stdout);
if (!create_directory(dest_dir)) if (!create_directory(tblspc_dir))
{ {
fprintf(stderr, _("%s: couldn't create directory \"%s\"... "), fprintf(stderr, _("%s: couldn't create directory \"%s\"... "),
progname, dest_dir); progname, tblspc_dir);
PQclear(res); PQclear(res);
PQfinish(conn); PQfinish(conn);
return; return;
@@ -379,13 +382,13 @@ do_standby_clone(void)
/* Present but empty, fix permissions and use it */ /* Present but empty, fix permissions and use it */
if (verbose) if (verbose)
printf(_("fixing permissions on existing directory \"%s\"... "), printf(_("fixing permissions on existing directory \"%s\"... "),
dest_dir); tblspc_dir);
fflush(stdout); fflush(stdout);
if (!set_directory_permissions(dest_dir)) if (!set_directory_permissions(tblspc_dir))
{ {
fprintf(stderr, _("%s: could not change permissions of directory \"%s\": %s\n"), fprintf(stderr, _("%s: could not change permissions of directory \"%s\": %s\n"),
progname, dest_dir, strerror(errno)); progname, tblspc_dir, strerror(errno));
PQclear(res); PQclear(res);
PQfinish(conn); PQfinish(conn);
return; return;
@@ -395,14 +398,14 @@ do_standby_clone(void)
/* Present and not empty */ /* Present and not empty */
fprintf(stderr, fprintf(stderr,
_("%s: directory \"%s\" exists but is not empty\n"), _("%s: directory \"%s\" exists but is not empty\n"),
progname, dest_dir); progname, tblspc_dir);
PQclear(res); PQclear(res);
PQfinish(conn); PQfinish(conn);
return; return;
default: default:
/* Trouble accessing directory */ /* Trouble accessing directory */
fprintf(stderr, _("%s: could not access directory \"%s\": %s\n"), fprintf(stderr, _("%s: could not access directory \"%s\": %s\n"),
progname, dest_dir, strerror(errno)); progname, tblspc_dir, strerror(errno));
PQclear(res); PQclear(res);
PQfinish(conn); PQfinish(conn);
return; return;