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

Ensure an inactive PostgreSQL data directory can be deleted.

Browse Source 
Addresses GitHub #366.
This commit is contained in:
Ian Barwick
2018-02-02 17:12:25 +09:00
parent ea653a8dbc
commit 34dbf64f50
1 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
dirutil.c
View File

@@ -34,6 +34,7 @@
#include "dirutil.h" #include "dirutil.h"
#include "strutil.h" #include "strutil.h"
#include "log.h" #include "log.h"
#include "controldata.h"
static int unlink_dir_callback(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf); static int unlink_dir_callback(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf);
@@ -246,8 +247,6 @@ is_pg_dir(char *path)
bool bool
create_pg_dir(char *path, bool force) create_pg_dir(char *path, bool force)
{ {
bool pg_dir = false;
/* Check this directory could be used as a PGDATA dir */ /* Check this directory could be used as a PGDATA dir */
switch (check_dir(path)) switch (check_dir(path))
{ {
@@ -279,35 +278,48 @@ create_pg_dir(char *path, bool force)
log_warning(_("directory \"%s\" exists but is not empty"), log_warning(_("directory \"%s\" exists but is not empty"),
path); path);
pg_dir = is_pg_dir(path); if (is_pg_dir(path))
if (pg_dir && force)
{ {
/* TODO: check DB state, if not running overwrite */ DBState db_state;
if (false) /* note: state will be DB_SHUTDOWNED if unable to read a control file */
db_state = get_db_state(path);
if (force == true)
{ {
if (db_state != DB_SHUTDOWNED && db_state != DB_SHUTDOWNED_IN_RECOVERY)
{
log_error(_("directory \"%s\" appears to be an active PostgreSQL data directory"), path);
log_detail(_("instance appears to be running in state \"%s\""), describe_db_state(db_state));
log_hint(_("any running instance must be shut down"));
return false;
}
log_notice(_("deleting existing data directory \"%s\""), path); log_notice(_("deleting existing data directory \"%s\""), path);
nftw(path, unlink_dir_callback, 64, FTW_DEPTH | FTW_PHYS); nftw(path, unlink_dir_callback, 64, FTW_DEPTH | FTW_PHYS);
return true;
}
else
{
return false;
} }
/* Let it continue */
break;
} }
else if (pg_dir && !force) else
{ {
log_hint(_("This looks like a PostgreSQL directory.\n" if (force == true)
"If you are sure you want to clone here, " {
"please check there is no PostgreSQL server " log_notice(_("deleting existing directory \"%s\""), path);
"running and use the -F/--force option")); nftw(path, unlink_dir_callback, 64, FTW_DEPTH | FTW_PHYS);
return true;
}
return false; return false;
} }
break;
return false;
default: default:
log_error(_("could not access directory \"%s\": %s"), log_error(_("could not access directory \"%s\": %s"),
path, strerror(errno)); path, strerror(errno));
return false; return false;
} }
return true; return true;
} }