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

"node check": add server role check

Browse Source
This commit is contained in:
Ian Barwick
2017-08-14 22:57:09 +09:00
parent fa7d60cd51
commit 10ef30096c
9 changed files with 156 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
dbutils.c
View File

@@ -1038,9 +1038,16 @@ get_recovery_type(PGconn *conn)
PQerrorMessage(conn));
recovery_type = RECTYPE_UNKNOWN;
}
else if (PQntuples(res) == 1 && strcmp(PQgetvalue(res, 0, 0), "t") == 0)
else if (PQntuples(res) == 1)
{
recovery_type = RECTYPE_STANDBY;
if (strcmp(PQgetvalue(res, 0, 0), "f") == 0)
{
recovery_type = RECTYPE_PRIMARY;
}
else
{
recovery_type = RECTYPE_STANDBY;
}
}
PQclear(res);
@@ -1462,19 +1469,23 @@ get_replication_lag_seconds(PGconn *conn)
" AS lag_seconds");
res = PQexec(conn, query.data);
log_verbose(LOG_DEBUG, "get_replication_lag_seconds():\n%s", query.data);
termPQExpBuffer(&query);
log_verbose(LOG_DEBUG, "get_node_record():\n%s", query.data);
if (PQresultStatus(res) != PGRES_TUPLES_OK || !PQntuples(res))
if (PQresultStatus(res) != PGRES_TUPLES_OK)
{
log_warning("%s", PQerrorMessage(conn));
log_warning("%s", PQerrorMessage(conn));
PQclear(res);
/* XXX magic number */
return -1;
}
if (!PQntuples(res))
{
return -1;
}
lag_seconds = atoi(PQgetvalue(res, 0, 0));
PQclear(res);
@@ -3576,7 +3587,7 @@ get_last_wal_receive_location(PGconn *conn)
/* ============= */
bool
is_bdr_db(PGconn *conn)
is_bdr_db(PGconn *conn, PQExpBufferData *output)
{
PQExpBufferData query;
PGresult *res = NULL;
@@ -3604,7 +3615,13 @@ is_bdr_db(PGconn *conn)
if (is_bdr_db == false)
{
log_warning(_("BDR extension is not available for this database"));
const char *warning = _("BDR extension is not available for this database");
if (output != NULL)
appendPQExpBuffer(output, "%s", warning);
else
log_warning("%s", warning);
return is_bdr_db;
}
@@ -3620,11 +3637,15 @@ is_bdr_db(PGconn *conn)
if (is_bdr_db == false)
{
log_warning(_("BDR extension available for this database, but the database is not configured for BDR"));
const char *warning = _("BDR extension available for this database, but the database is not configured for BDR");
if (output != NULL)
appendPQExpBuffer(output, "%s", warning);
else
log_warning("%s", warning);
}
PQclear(res);
PQclear(res);
return is_bdr_db;
}