Skip to content

[3.4] Backport clientv3: Replace balancer with upstream grpc solution#16827

Closed
chaochn47 wants to merge 5 commits intoetcd-io:release-3.4from
chaochn47:release-3.4-remove-balancer
Closed

[3.4] Backport clientv3: Replace balancer with upstream grpc solution#16827
chaochn47 wants to merge 5 commits intoetcd-io:release-3.4from
chaochn47:release-3.4-remove-balancer

Conversation

@chaochn47
Copy link
Copy Markdown
Member

@chaochn47 chaochn47 commented Oct 25, 2023 •
edited by ahrtr
Loading

Part of #16740

This PR fully removes etcd customized implementation of gRPC old balancer API without breaking changes.

Backported

#16826 should be merged first and this PR will be rebased on top of that.

This should allow us bump gRPC to v1.51.0 easier in release-3.4 in the follow up PR.

Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.

@chaochn47 chaochn47 force-pushed the release-3.4-remove-balancer branch 4 times, most recently from 5169fa1 to 73133bf Compare October 26, 2023 03:58
@chaochn47 chaochn47 marked this pull request as ready for review October 26, 2023 04:18
@ahrtr ahrtr mentioned this pull request Oct 26, 2023
Closed
24 tasks
@ahrtr
Copy link
Copy Markdown
Member

ahrtr commented Oct 27, 2023

@chaochn47 please rebase this PR. thx

YoyinZyc and others added 5 commits October 27, 2023 09:04
@YoyinZyc @chaochn47
clientV3: simplify grpc dialer usage. Remove workaround etcd-io#11184 …
0549566 
…after bumping grpc to 1.26.0.

Signed-off-by: Chao Chen <chaochn@amazon.com>
@chaochn47
[3.4] Backport etcd-io#12671 clientv3: Replace balancer with upstream…
d44b29e 
… grpc solution

Signed-off-by: Chao Chen <chaochn@amazon.com>
@chaochn47
[3.4] backport etcd-io#12706 clientv3: PS: Replace balancer with upst…
856d02c 
…ream grpc solution

Signed-off-by: Chao Chen <chaochn@amazon.com>
@chaochn47
[3.4] backport etcd-io#13203 client: call .Endpoints() in dial() in c…
b25b531 
…lient/v3/client.go instead of accessing cfg.Endpoints directly

Signed-off-by: Chao Chen <chaochn@amazon.com>
@chaochn47
[3.4] backport etcd-io#13359 Fix http2 authority header in single end…
1d4e20b 
…point scenario

Signed-off-by: Chao Chen <chaochn@amazon.com>
@chaochn47 chaochn47 force-pushed the release-3.4-remove-balancer branch from 73133bf to 1d4e20b Compare October 27, 2023 16:06
@chaochn47
Copy link
Copy Markdown
Member Author

chaochn47 commented Oct 27, 2023 •
edited
Loading

@ahrtr

This PR has been rebased. PTAL one commit at a time, thanks~

@ahrtr
Copy link
Copy Markdown
Member

ahrtr commented Oct 27, 2023

This is a huge PR. Could you break down this PR, such as backporting each PR in the list separately?

@chaochn47
Copy link
Copy Markdown
Member Author

chaochn47 commented Oct 27, 2023

This is a huge PR. Could you break down this PR, such as backporting each PR in the list separately?

It's doable.

Just want to confirm that even if the backported PR introduces bug, it's okay to backport the fix separately, correct?

@ahrtr
Copy link
Copy Markdown
Member

ahrtr commented Oct 27, 2023

Just want to confirm that even if the backported PR introduces bug, it's okay to backport the fix separately, correct?

I think so. The goal right now is to break down this huge PR to make the reviewing easier.

@chaochn47 chaochn47 mentioned this pull request Oct 27, 2023
Merged
@chaochn47
Copy link
Copy Markdown
Member Author

chaochn47 commented Oct 27, 2023

Just want to confirm that even if the backported PR introduces bug, it's okay to backport the fix separately, correct?

I think so. The goal right now is to break down this huge PR to make the reviewing easier.

First one is out.

@chaochn47 chaochn47 mentioned this pull request Oct 27, 2023
Merged
@chaochn47 chaochn47 closed this Oct 28, 2023
@chaochn47 chaochn47 deleted the release-3.4-remove-balancer branch October 28, 2023 04:15
@chaochn47 chaochn47 mentioned this pull request Oct 31, 2023
Merged
@ahrtr
Copy link
Copy Markdown
Member

ahrtr commented Nov 15, 2023

@chaochn47 are you still working on backporting the last PR?

@chaochn47
Copy link
Copy Markdown
Member Author

chaochn47 commented Nov 15, 2023

Yeah, I will help my colleague @jasdel to finish the remaining gRPC version upgrade to resolve the CVE.

Is there a deadline so we can adjust the priorities on our TODO list?

@ahrtr
Copy link
Copy Markdown
Member

ahrtr commented Nov 16, 2023

It's a blocker for #16751. I expect it can be resolved asap to unblock the release of 3.4.28 (which includes fixes to two CVEs). Thanks.

@chaochn47 chaochn47 mentioned this pull request Nov 22, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@chaochn47 @ahrtr @YoyinZyc