Skip to content

OriginalDstCluster: Use ThreadAwareLoadBalancer#7820

Merged
mattklein123 merged 10 commits intoenvoyproxy:masterfrom
jrajahalme:fix-original-dst-cluster
Aug 8, 2019
Merged

OriginalDstCluster: Use ThreadAwareLoadBalancer#7820
mattklein123 merged 10 commits intoenvoyproxy:masterfrom
jrajahalme:fix-original-dst-cluster

Conversation

@jrajahalme
Copy link
Copy Markdown
Contributor

Use ThreadAwareLoadBalancer in OriginalDstCluster to pass
OriginalDstClusterSharedPtr to LoadBalancer.

Risk Level: Low
Fixes: #7500
Signed-off-by: Jarno Rajahalme jarno@covalent.io

Use ThreadAwareLoadBalancer in OriginalDstCluster to pass
OriginalDstClusterSharedPtr to LoadBalancer.

Fixes: envoyproxy#7500
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
Copy link
Copy Markdown
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks. Can you check CI and merge master?

/wait

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@mattklein123
Copy link
Copy Markdown
Member

Please check CI.

/wait

ThreadAwareLoadBalancers are stateless and recreted each time the
host set changes. Remove the internal state from the
OriginalDstCluster::LoadBalancer and use a shared host map instead.

Allow CLUSTER_PROVIDED to be configured as the LB type for
ORIGINAL_DST cluster type. Map the ORIGINAL_DST_LB type to
CLUSTER_PROVIDED so that providing the ThreadAwareLoadBalancer will
not throw.

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
Less chatty debugging experience.

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@jrajahalme
Copy link
Copy Markdown
Contributor Author

Using a shared host map now. Hoping for the CI to pass :-)

Copy link
Copy Markdown
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, this is a great cleanup. One deprecation request, otherwise LGTM. Thank you @jrajahalme!

/wait

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
ORIGINAL_DST_LB loab balancing type specifier is no longer needed, as
CLUSTER_PROVIDED can be used instead.

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@repokitteh-read-only
Copy link
Copy Markdown

CC @envoyproxy/api-shepherds: Your approval is needed for changes made to api/.

🐱

Caused by: #7820 was synchronize by jrajahalme.

see: more, trace.

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@repokitteh-read-only
Copy link
Copy Markdown

CC @envoyproxy/api-shepherds: Your approval is needed for changes made to api/.

🐱

Caused by: #7820 was synchronize by jrajahalme.

see: more, trace.

Copy link
Copy Markdown
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, LGTM with one question.

/wait-any

Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@repokitteh-read-only
Copy link
Copy Markdown

CC @envoyproxy/api-shepherds: Your approval is needed for changes made to api/.

🐱

Caused by: #7820 was synchronize by jrajahalme.

see: more, trace.

Copy link
Copy Markdown
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thank you!

@mattklein123 mattklein123 merged commit e03936e into envoyproxy:master Aug 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Creating thread local cluster with LoadBalancerType::OriginalDst can't find its ClusterData in active_clusters_ and crash

2 participants