aboutsummaryrefslogtreecommitdiffstats
path: root/configd
diff options
context:
space:
mode:
authorArne Juul <arnej@verizonmedia.com>2021-06-09 07:25:12 +0000
committerArne Juul <arnej@verizonmedia.com>2021-06-09 07:39:53 +0000
commit3a306bba7b1871ae64a582991da77d24390b8a36 (patch)
tree84d774c4afba09cb5c43d4b39e140fb57f231c6f /configd
parent8d76a69b1b0f70e10fbfdde4e2b9e1ab442632e6 (diff)
rename enums, used for more than just reverse ping
Diffstat (limited to 'configd')
-rw-r--r--configd/src/apps/sentinel/connectivity.cpp10
-rw-r--r--configd/src/apps/sentinel/outward-check.cpp6
-rw-r--r--configd/src/apps/sentinel/outward-check.h2
3 files changed, 9 insertions, 9 deletions
diff --git a/configd/src/apps/sentinel/connectivity.cpp b/configd/src/apps/sentinel/connectivity.cpp
index e9897247101..ebf34a3ac5e 100644
--- a/configd/src/apps/sentinel/connectivity.cpp
+++ b/configd/src/apps/sentinel/connectivity.cpp
@@ -27,11 +27,11 @@ namespace {
std::string toString(CcResult value) {
switch (value) {
case CcResult::UNKNOWN: return "BAD: missing result"; // very very bad
- case CcResult::REVERSE_FAIL: return "connect OK, but reverse check FAILED"; // very bad
+ case CcResult::REMOTE_PING_FAIL: return "connect OK, but reverse check FAILED"; // very bad
case CcResult::UNREACHABLE_UP: return "unreachable from me, but up"; // very bad
case CcResult::CONN_FAIL: return "failed to connect"; // bad
case CcResult::AFFIRMED_DOWN: return "affirmed down"; // a problem, but probably not on this end
- case CcResult::REVERSE_UNAVAIL: return "connect OK (but reverse check unavailable)"; // unfortunate
+ case CcResult::REMOTE_PING_UNAVAIL: return "connect OK (but reverse check unavailable)"; // unfortunate
case CcResult::ALL_OK: return "OK: both ways connectivity verified"; // good
}
LOG(error, "Unknown CcResult enum value: %d", (int)value);
@@ -106,7 +106,7 @@ void classifyConnFails(ConnectivityMap &connectivityMap,
size_t numReportsUp = 0;
size_t numReportsDown = 0;
for (const auto & [hostname, probe] : cornerProbes) {
- if (probe.result() == CcResult::REVERSE_FAIL) ++numReportsDown;
+ if (probe.result() == CcResult::REMOTE_PING_FAIL) ++numReportsDown;
if (probe.result() == CcResult::ALL_OK) ++numReportsUp;
}
if (numReportsUp > numReportsDown) {
@@ -161,7 +161,7 @@ Connectivity::checkConnectivity(RpcServer &rpcServer) {
LOG_ASSERT(check.result() != CcResult::UNKNOWN);
switch (check.result()) {
case CcResult::UNREACHABLE_UP:
- case CcResult::REVERSE_FAIL:
+ case CcResult::REMOTE_PING_FAIL:
++numUpButBad;
++numProblematic;
break;
@@ -170,7 +170,7 @@ Connectivity::checkConnectivity(RpcServer &rpcServer) {
++numProblematic;
break;
case CcResult::UNKNOWN:
- case CcResult::REVERSE_UNAVAIL:
+ case CcResult::REMOTE_PING_UNAVAIL:
case CcResult::ALL_OK:
break;
}
diff --git a/configd/src/apps/sentinel/outward-check.cpp b/configd/src/apps/sentinel/outward-check.cpp
index 1f3e5b7524d..93068459292 100644
--- a/configd/src/apps/sentinel/outward-check.cpp
+++ b/configd/src/apps/sentinel/outward-check.cpp
@@ -34,18 +34,18 @@ void OutwardCheck::RequestDone(FRT_RPCRequest *req) {
} else if (answer == "bad") {
LOG(debug, "connected to %s, but reverse connectivity fails: %s",
_spec.c_str(), answer.c_str());
- _result = CcResult::REVERSE_FAIL;
+ _result = CcResult::REMOTE_PING_FAIL;
} else {
LOG(warning, "connected to %s, but strange reverse connectivity: %s",
_spec.c_str(), answer.c_str());
- _result = CcResult::REVERSE_UNAVAIL;
+ _result = CcResult::REMOTE_PING_UNAVAIL;
}
} else if (req->GetErrorCode() == FRTE_RPC_NO_SUCH_METHOD ||
req->GetErrorCode() == FRTE_RPC_WRONG_PARAMS ||
req->GetErrorCode() == FRTE_RPC_WRONG_RETURN)
{
LOG(debug, "Connected OK to %s but no reverse connectivity check available", _spec.c_str());
- _result = CcResult::REVERSE_UNAVAIL;
+ _result = CcResult::REMOTE_PING_UNAVAIL;
} else {
LOG(debug, "error on request to %s : %s (%d)", _spec.c_str(),
req->GetErrorMessage(), req->GetErrorCode());
diff --git a/configd/src/apps/sentinel/outward-check.h b/configd/src/apps/sentinel/outward-check.h
index d8803e22a02..904cfc9a271 100644
--- a/configd/src/apps/sentinel/outward-check.h
+++ b/configd/src/apps/sentinel/outward-check.h
@@ -27,7 +27,7 @@ struct OutwardCheckContext {
~OutwardCheckContext();
};
-enum class CcResult { UNKNOWN, AFFIRMED_DOWN, CONN_FAIL, UNREACHABLE_UP, REVERSE_FAIL, REVERSE_UNAVAIL, ALL_OK };
+enum class CcResult { UNKNOWN, AFFIRMED_DOWN, CONN_FAIL, UNREACHABLE_UP, REMOTE_PING_FAIL, REMOTE_PING_UNAVAIL, ALL_OK };
class OutwardCheck : public FRT_IRequestWait {
private: