Skip to content

upstream: trigger original dst clean only when hosts are there #6152

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
mattklein123 merged 4 commits into from
Mar 5, 2019
Merged

upstream: trigger original dst clean only when hosts are there #6152

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cfee835
original dst log line
ramaraochavali Mar 2, 2019
58625f3
change to trace
ramaraochavali Mar 3, 2019
b42c079
add additional trace
ramaraochavali Mar 3, 2019
bce1701
comments
ramaraochavali Mar 3, 2019
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
22 changes: 12 additions & 10 deletions source/common/upstream/original_dst_cluster.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,16 +160,18 @@ void OriginalDstCluster::cleanup() {
// Given the current config, only EDS clusters support multiple priorities.
ASSERT(priority_set_.hostSetsPerPriority().size() == 1);
const auto& host_set = priority_set_.getOrCreateHostSet(0);

ENVOY_LOG(debug, "Cleaning up stale original dst hosts.");
for (const HostSharedPtr& host : host_set.hosts()) {
if (host->used()) {
ENVOY_LOG(debug, "Keeping active host {}.", host->address()->asString());
new_hosts->emplace_back(host);
host->used(false); // Mark to be removed during the next round.
} else {
ENVOY_LOG(debug, "Removing stale host {}.", host->address()->asString());
to_be_removed.emplace_back(host);
ENVOY_LOG(trace, "Stale original dst hosts cleanup triggered.");
if (!host_set.hosts().empty()) {
ENVOY_LOG(debug, "Cleaning up stale original dst hosts.");
for (const HostSharedPtr& host : host_set.hosts()) {
if (host->used()) {
ENVOY_LOG(debug, "Keeping active host {}.", host->address()->asString());
new_hosts->emplace_back(host);
host->used(false); // Mark to be removed during the next round.
} else {
ENVOY_LOG(debug, "Removing stale host {}.", host->address()->asString());
to_be_removed.emplace_back(host);
}
}
}

Expand Down