Skip to content
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.

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

OriginalDstCluster: Use ThreadAwareLoadBalancer #7820

Merged
merged 10 commits into from
Aug 8, 2019

Conversation

jrajahalme
Copy link
Contributor

Use ThreadAwareLoadBalancer in OriginalDstCluster to pass
OriginalDstClusterSharedPtr to LoadBalancer.

Risk Level: Low
Fixes: #7500
Signed-off-by: Jarno Rajahalme [email protected]

Use ThreadAwareLoadBalancer in OriginalDstCluster to pass
OriginalDstClusterSharedPtr to LoadBalancer.

Fixes: envoyproxy#7500
Signed-off-by: Jarno Rajahalme <[email protected]>
Copy link
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

source/common/upstream/original_dst_cluster.cc Outdated Show resolved Hide resolved
@mattklein123
Copy link
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 <[email protected]>
Less chatty debugging experience.

Signed-off-by: Jarno Rajahalme <[email protected]>
@jrajahalme
Copy link
Contributor Author

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

Copy link
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

source/common/upstream/original_dst_cluster.h Outdated Show resolved Hide resolved
source/common/upstream/original_dst_cluster.h Outdated Show resolved Hide resolved
Signed-off-by: Jarno Rajahalme <[email protected]>
ORIGINAL_DST_LB loab balancing type specifier is no longer needed, as
CLUSTER_PROVIDED can be used instead.

Signed-off-by: Jarno Rajahalme <[email protected]>
@repokitteh-read-only
Copy link

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 <[email protected]>
@repokitteh-read-only
Copy link

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
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

api/envoy/api/v2/cds.proto Outdated Show resolved Hide resolved
@repokitteh-read-only
Copy link

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
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
2 participants