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.

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

Jump to bottom

buildPortsToEndpointsMap should use flattened value type #76737

Closed
wants to merge 1 commit into from
Closed

buildPortsToEndpointsMap should use flattened value type #76737

wants to merge 1 commit into from

Conversation

tedyu
Copy link
Contributor

@tedyu tedyu commented Apr 17, 2019

What type of PR is this?
/kind bug

What this PR does / why we need it:
Currently buildPortsToEndpointsMap uses []hostPortPair as value type.
Looking at the calls to this func:

		newEndpoints := flattenValidEndpoints(portsToEndpoints[portname])

We always flatten the value before using it.

Which issue(s) this PR fixes:
Fixes #76718

NONE

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 17, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @tedyu. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: tedyu
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: thockin

If they are not already assigned, you can assign the PR to them by writing /assign @thockin in a comment when ready.

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added sig/network Categorizes an issue or PR as relevant to SIG Network. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Apr 17, 2019
@tedyu
Copy link
Contributor Author

tedyu commented Apr 17, 2019

ping @brendandburns @vishh @freehan for review

@k8s-ci-robot k8s-ci-robot added the kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. label Apr 17, 2019
neolit123
neolit123 reviewed Apr 17, 2019
View reviewed changes
Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

thanks for the PR
/remove-kind bug
/kind cleanup
/priority backlog
/ok-to-test

@k8s-ci-robot k8s-ci-robot added priority/backlog Higher priority than priority/awaiting-more-evidence. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed kind/bug Categorizes issue or PR as related to a bug. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Apr 17, 2019
@tedyu
Copy link
Contributor Author

tedyu commented Apr 18, 2019

ping @thockin @smarterclayton for review

@tedyu
Copy link
Contributor Author

tedyu commented Apr 18, 2019

@freehan
This is the PR you were asking about.

@tedyu
Copy link
Contributor Author

tedyu commented Apr 19, 2019

ping @danwinship @dcbw for review

@tedyu
Copy link
Contributor Author

tedyu commented Apr 24, 2019

ping @danwinship @dcbw

@tedyu
Copy link
Contributor Author

tedyu commented May 1, 2019

ping @dcbw for review

smarterclayton
smarterclayton reviewed May 2, 2019
View reviewed changes
pkg/proxy/userspace/roundrobin.go
@@ -245,16 +245,19 @@ func (lb *LoadBalancerRR) updateAffinityMap(svcPort proxy.ServicePortName, newEn

// buildPortsToEndpointsMap builds a map of portname -> all ip:ports for that
// portname. Expode Endpoints.Subsets[*] into this structure.
func buildPortsToEndpointsMap(endpoints *v1.Endpoints) map[string][]hostPortPair {
portsToEndpoints := map[string][]hostPortPair{}
func buildPortsToEndpointsMap(endpoints *v1.Endpoints) map[string][]string {
Copy link
Contributor

Choose a reason for hiding this comment

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

This really needs a test to prove that it didn't change. Also, I'm not sure why we would want to weaken the type?

@tedyu
Copy link
Contributor Author

tedyu commented May 26, 2019

ping @dcbw for review

danwinship
danwinship suggested changes Aug 13, 2019
View reviewed changes
pkg/proxy/userspace/roundrobin.go
portsToEndpoints[port.Name] = append(portsToEndpoints[port.Name], hostPortPair{addr.IP, int(port.Port)})
// Ignore the protocol field - we'll get that from the Service objects.
hpp := &hostPortPair{addr.IP, int(port.Port)}
if isValidEndpoint(hpp) {
Copy link
Contributor

Choose a reason for hiding this comment

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

You should just make isValidEndpoint take an IP and port. And then I believe the entire hostPortPair type would be unused. Also, flattenValidEndpoints would be unused (other than the test case in roundrobin_test.go which is pointless now since nothing in the real code is using that function). So it could also be removed. And as Clayton said before, there ought to be a unit test of buildPortsToEndpointsMap.

Also, pkg/proxy/winuserspace/ uses exactly the same code and should get exactly the same fix

@tedyu tedyu mentioned this pull request Aug 13, 2019
Merged
@tedyu
Copy link
Contributor Author

tedyu commented Aug 13, 2019

@danwinship
This PR was created before I adopted branching.
Please review #81378

@tedyu tedyu closed this Aug 13, 2019
@tedyu tedyu mentioned this pull request Jan 23, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neolit123 neolit123 neolit123 left review comments

@smarterclayton smarterclayton smarterclayton left review comments

@danwinship danwinship danwinship requested changes

@thockin thockin Awaiting requested review from thockin

Assignees
No one assigned
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/backlog Higher priority than priority/awaiting-more-evidence. release-note-none Denotes a PR that doesn't merit a release note. sig/network Categorizes an issue or PR as relevant to SIG Network. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

buildPortsToEndpointsMap should use flattened value type
5 participants
@tedyu @k8s-ci-robot @danwinship @neolit123 @smarterclayton