Cleanup patch about CLUSTER CLEANUP

This commit is contained in:
Jaime Casanova
2012-04-26 12:21:41 -05:00
parent 0660bded0b
commit d0959b953e

View File

@@ -402,8 +402,6 @@ do_cluster_cleanup(void)
PGconn *master_conn; PGconn *master_conn;
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);
@@ -419,31 +417,31 @@ 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(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);
} }