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

Fix a few bugs introduced when merging features

Browse Source
This commit is contained in:
Jaime Casanova
2012-06-15 09:40:09 -05:00
parent 64fce88e99
commit 9e10987b90
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
check_dir.c
View File

@@ -231,7 +231,7 @@ is_pg_dir(char *dir)
return true; return true;
// test tablespace dir // test tablespace dir
sprintf(path, "ls %s/PG_9.0_*/ -I*", dir); sprintf(path, "ls %s/PG_*/ -I*", dir);
r = system(path); r = system(path);
if (r == 0) if (r == 0)
return true; return true;

18
repmgr.c
View File

@@ -83,7 +83,7 @@ bool need_a_node = true;
bool require_password = false; bool require_password = false;
/* Initialization of runtime options */ /* Initialization of runtime options */
t_runtime_options runtime_options = { "", "", "", "", "", "", DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, "", 0 }; t_runtime_options runtime_options = { "", "", "", "", "", "", DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, "", "", 0 };
t_configuration_options options = { "", -1, "", MANUAL_FAILOVER, -1, "", "", "", "", "", "", -1 }; t_configuration_options options = { "", -1, "", MANUAL_FAILOVER, -1, "", "", "", "", "", "", -1 };
static char *server_mode = NULL; static char *server_mode = NULL;
@@ -423,11 +423,9 @@ do_cluster_show(void)
do_cluster_cleanup(void) do_cluster_cleanup(void)
{ {
int master_id; int master_id;
PGconn *master_conn; PGconn *master_conn = NULL;
PGresult *res; PGresult *res;
char sqlquery[QUERY_STR_LEN]; char sqlquery[QUERY_STR_LEN];
char node_role[MAXLEN];
int i;
/* check if there is a master in this cluster */ /* check if there is a master in this cluster */
log_info(_("%s connecting to master database\n"), progname); log_info(_("%s connecting to master database\n"), progname);
@@ -443,30 +441,30 @@ do_cluster_cleanup(void)
{ {
sqlquery_snprintf(sqlquery, "DELETE FROM %s.repl_monitor " sqlquery_snprintf(sqlquery, "DELETE FROM %s.repl_monitor "
" WHERE age(now(), last_monitor_time) >= '%d days'::interval;", " WHERE age(now(), last_monitor_time) >= '%d days'::interval;",
repmgr_schema, keep_history); repmgr_schema, runtime_options.keep_history);
} }
else else
{ {
sqlquery_snprintf(sqlquery, "TRUNCATE TABLE %s.repl_monitor;", repmgr_schema); sqlquery_snprintf(sqlquery, "TRUNCATE TABLE %s.repl_monitor;", repmgr_schema);
} }
res = PQexec(conn, sqlquery); res = PQexec(master_conn, sqlquery);
if (PQresultStatus(res) != PGRES_COMMAND_OK) if (PQresultStatus(res) != PGRES_COMMAND_OK)
{ {
log_err(_("cluster cleanup: Couldn't clean history\n%s\n"), PQerrorMessage(conn)); log_err(_("cluster cleanup: Couldn't clean history\n%s\n"), PQerrorMessage(master_conn));
PQclear(res); PQclear(res);
PQfinish(conn); PQfinish(master_conn);
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
PQclear(res); PQclear(res);
/* Let's VACUUM the table to avoid autovacuum to be launched in an unexpected hour */ /* Let's VACUUM the table to avoid autovacuum to be launched in an unexpected hour */
sqlquery_snprintf(sqlquery, "VACUUM %s.repl_monitor;", repmgr_schema); sqlquery_snprintf(sqlquery, "VACUUM %s.repl_monitor;", repmgr_schema);
res = PQexec(conn, sqlquery); res = PQexec(master_conn, sqlquery);
/* XXX There is any need to check this VACUUM happens without problems? */ /* XXX There is any need to check this VACUUM happens without problems? */
PQclear(res); PQclear(res);
PQfinish(conn); PQfinish(master_conn);
} }