use a constant to denote unknown replication lag

This commit is contained in:
Ian Barwick
2019-03-20 17:26:04 +09:00
parent 7204a0faf4
commit 314a1e8f4f
4 changed files with 5 additions and 5 deletions

View File

@@ -5050,13 +5050,12 @@ get_replication_lag_seconds(PGconn *conn)
log_warning("%s", PQerrorMessage(conn)); log_warning("%s", PQerrorMessage(conn));
PQclear(res); PQclear(res);
/* XXX magic number */ return UNKNOWN_REPLICATION_LAG;
return -1;
} }
if (!PQntuples(res)) if (!PQntuples(res))
{ {
return -1; return UNKNOWN_REPLICATION_LAG;
} }
lag_seconds = atoi(PQgetvalue(res, 0, 0)); lag_seconds = atoi(PQgetvalue(res, 0, 0));

View File

@@ -1408,7 +1408,7 @@ do_node_check_replication_lag(PGconn *conn, OutputMode mode, t_node_info *node_i
break; break;
} }
} }
else if (lag_seconds < 0) else if (lag_seconds == UNKNOWN_REPLICATION_LAG)
{ {
status = CHECK_STATUS_UNKNOWN; status = CHECK_STATUS_UNKNOWN;

View File

@@ -3883,7 +3883,7 @@ do_standby_switchover(void)
log_detail(_("lag is %i seconds (warning threshold: %i)"), log_detail(_("lag is %i seconds (warning threshold: %i)"),
lag_seconds, config_file_options.replication_lag_warning); lag_seconds, config_file_options.replication_lag_warning);
} }
else if (lag_seconds < 0) else if (lag_seconds == UNKNOWN_REPLICATION_LAG)
{ {
if (runtime_options.force == false) if (runtime_options.force == false)
{ {

View File

@@ -55,6 +55,7 @@
#define UNKNOWN_TIMELINE_ID -1 #define UNKNOWN_TIMELINE_ID -1
#define UNKNOWN_SYSTEM_IDENTIFIER 0 #define UNKNOWN_SYSTEM_IDENTIFIER 0
#define UNKNOWN_PID -1 #define UNKNOWN_PID -1
#define UNKNOWN_REPLICATION_LAG -1
#define NODE_NOT_FOUND -1 #define NODE_NOT_FOUND -1
#define NO_UPSTREAM_NODE -1 #define NO_UPSTREAM_NODE -1