Skip to content

Port #7837 from core strategy to plugin #8573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
traeak merged 1 commit into from
Jan 5, 2022
Merged

Port #7837 from core strategy to plugin #8573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions plugins/experimental/parent_select/strategy.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ PLNextHopSelectionStrategy::Init(const YAML::Node &n)
max_simple_retries = failover_node["max_simple_retries"].as<int>();
}

if (failover_node["max_unavailable_retries"]) {
max_unavailable_retries = failover_node["max_unavailable_retries"].as<int>();
}

YAML::Node resp_codes_node;
// connection failures are always failure and retryable (pending retries)
resp_codes.add(STATUS_CONNECTION_FAILURE);
Expand All @@ -136,6 +140,24 @@ PLNextHopSelectionStrategy::Init(const YAML::Node &n)
resp_codes.sort();
}
}
YAML::Node markdown_codes_node;
if (failover_node["markdown_codes"]) {
markdown_codes_node = failover_node["markdown_codes"];
if (markdown_codes_node.Type() != YAML::NodeType::Sequence) {
PL_NH_Error("Error in the markdown_codes definition for the strategy named '%s', skipping markdown_codes.",
strategy_name.c_str());
} else {
for (auto &&k : markdown_codes_node) {
auto code = k.as<int>();
if (code > 300 && code < 599) {
markdown_codes.add(code);
} else {
PL_NH_Note("Skipping invalid markdown response code '%d' for the strategy named '%s'.", code, strategy_name.c_str());
}
}
markdown_codes.sort();
}
}
YAML::Node health_check_node;
if (failover_node["health_check"]) {
health_check_node = failover_node["health_check"];
Expand Down Expand Up @@ -235,20 +257,21 @@ PLNextHopSelectionStrategy::nextHopExists(TSHttpTxn txnp)
bool
PLNextHopSelectionStrategy::codeIsFailure(TSHttpStatus response_code)
{
return this->resp_codes.contains(response_code);
return this->resp_codes.contains(response_code) || this->markdown_codes.contains(response_code);
}

bool
PLNextHopSelectionStrategy::responseIsRetryable(unsigned int current_retry_attempts, TSHttpStatus response_code)
{
return this->codeIsFailure(response_code) && current_retry_attempts < this->max_simple_retries &&
current_retry_attempts < this->num_parents;
return (current_retry_attempts < this->num_parents) &&
((this->resp_codes.contains(response_code) && current_retry_attempts < this->max_simple_retries) ||
(this->markdown_codes.contains(response_code) && current_retry_attempts < this->max_unavailable_retries));
}

bool
PLNextHopSelectionStrategy::onFailureMarkParentDown(TSHttpStatus response_code)
{
return static_cast<int>(response_code) >= 500 && static_cast<int>(response_code) <= 599;
return this->markdown_codes.contains(response_code);
}

bool
Expand Down
17 changes: 10 additions & 7 deletions plugins/experimental/parent_select/strategy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,14 +258,17 @@ class PLNextHopSelectionStrategy : public TSNextHopSelectionStrategy
bool ignore_self_detect = false;
PLNHSchemeType scheme = PL_NH_SCHEME_NONE;
PLNHRingMode ring_mode = PL_NH_ALTERNATE_RING;
PLResponseCodes resp_codes;
PLResponseCodes resp_codes; // simple retry codes
PLResponseCodes markdown_codes; // unavailable server retry and markdown codes

PLHealthChecks health_checks;
PLNextHopHealthStatus passive_health;
std::vector<std::vector<std::shared_ptr<PLHostRecord>>> host_groups;
uint32_t max_simple_retries = 1;
uint32_t groups = 0;
uint32_t grp_index = 0;
uint32_t hst_index = 0;
uint32_t num_parents = 0;
uint32_t distance = 0; // index into the strategies list.
uint32_t max_simple_retries = 1;
uint32_t max_unavailable_retries = 1;
uint32_t groups = 0;
uint32_t grp_index = 0;
uint32_t hst_index = 0;
uint32_t num_parents = 0;
uint32_t distance = 0; // index into the strategies list.
};