Fix consistent hash based on source IP for TCP proxy by howardjohn · Pull Request #38438 · istio/istio

howardjohn · 2022-04-18T22:28:05Z

Fixes test flakes like
https://prow.istio.io/view/gs/istio-prow/logs/integ-ipv6_istio_postsubmit/1514637916112949248

We recently added TCP sourceIP consistent hash. Even more recently, this
test started to fail often. I believe this is due to a change to apply
YAML in parallel, exposing this bug.

The root cause is that we do not push LDS for DR changes, but the config
impacts LDS.

Please provide a description of this PR:

istio-policy-bot · 2022-04-18T22:28:07Z

🤔 🐛 You appear to be fixing a bug in Go code, yet your PR doesn't include updates to any test files. Did you forget to add a test?

Courtesy of your friendly test nag.

hzxuzhonghu · 2022-04-19T01:56:15Z

This is a bug fix, should be backported

Fixes test flakes like https://prow.istio.io/view/gs/istio-prow/logs/integ-ipv6_istio_postsubmit/1514637916112949248 We recently added TCP sourceIP consistent hash. Even more recently, this test started to fail often. I believe this is due to a change to apply YAML in parallel, exposing this bug. The root cause is that we do not push LDS for DR changes, but the config impacts LDS.

ericvn · 2022-04-19T17:34:51Z

/test gencheck_istio

istio-testing · 2022-04-20T01:06:39Z

In response to a cherrypick label: #38438 failed to apply on top of branch "release-1.11":

Applying: Fix consistent hash based on source IP for TCP proxy
Using index info to reconstruct a base tree...
M	pilot/pkg/xds/lds.go
M	tests/integration/pilot/common/routing.go
Falling back to patching base and 3-way merge...
Auto-merging tests/integration/pilot/common/routing.go
CONFLICT (content): Merge conflict in tests/integration/pilot/common/routing.go
Auto-merging pilot/pkg/xds/lds.go
CONFLICT (content): Merge conflict in pilot/pkg/xds/lds.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix consistent hash based on source IP for TCP proxy
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

istio-testing · 2022-04-20T01:06:40Z

In response to a cherrypick label: new issue created for failed cherrypick: #38458

istio-testing · 2022-04-20T01:07:18Z

In response to a cherrypick label: #38438 failed to apply on top of branch "release-1.11":

Applying: Fix consistent hash based on source IP for TCP proxy
Using index info to reconstruct a base tree...
M	pilot/pkg/xds/lds.go
M	tests/integration/pilot/common/routing.go
Falling back to patching base and 3-way merge...
Auto-merging tests/integration/pilot/common/routing.go
CONFLICT (content): Merge conflict in tests/integration/pilot/common/routing.go
Auto-merging pilot/pkg/xds/lds.go
CONFLICT (content): Merge conflict in pilot/pkg/xds/lds.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix consistent hash based on source IP for TCP proxy
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

istio-testing · 2022-04-20T01:07:19Z

In response to a cherrypick label: new issue created for failed cherrypick: #38459

istio-testing · 2022-04-20T01:07:21Z

In response to a cherrypick label: #38438 failed to apply on top of branch "release-1.12":

Applying: Fix consistent hash based on source IP for TCP proxy
Using index info to reconstruct a base tree...
M	pilot/pkg/xds/lds.go
M	tests/integration/pilot/common/routing.go
Falling back to patching base and 3-way merge...
Auto-merging tests/integration/pilot/common/routing.go
Auto-merging pilot/pkg/xds/lds.go
CONFLICT (content): Merge conflict in pilot/pkg/xds/lds.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix consistent hash based on source IP for TCP proxy
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

istio-testing · 2022-04-20T01:07:22Z

In response to a cherrypick label: new issue created for failed cherrypick: #38460

istio-testing · 2022-04-20T01:07:56Z

In response to a cherrypick label: #38438 failed to apply on top of branch "release-1.11":

Applying: Fix consistent hash based on source IP for TCP proxy
Using index info to reconstruct a base tree...
M	pilot/pkg/xds/lds.go
M	tests/integration/pilot/common/routing.go
Falling back to patching base and 3-way merge...
Auto-merging tests/integration/pilot/common/routing.go
CONFLICT (content): Merge conflict in tests/integration/pilot/common/routing.go
Auto-merging pilot/pkg/xds/lds.go
CONFLICT (content): Merge conflict in pilot/pkg/xds/lds.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix consistent hash based on source IP for TCP proxy
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

istio-testing · 2022-04-20T01:07:57Z

In response to a cherrypick label: new issue created for failed cherrypick: #38461

istio-testing · 2022-04-20T01:07:59Z

In response to a cherrypick label: #38438 failed to apply on top of branch "release-1.12":

Applying: Fix consistent hash based on source IP for TCP proxy
Using index info to reconstruct a base tree...
M	pilot/pkg/xds/lds.go
M	tests/integration/pilot/common/routing.go
Falling back to patching base and 3-way merge...
Auto-merging tests/integration/pilot/common/routing.go
Auto-merging pilot/pkg/xds/lds.go
CONFLICT (content): Merge conflict in pilot/pkg/xds/lds.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix consistent hash based on source IP for TCP proxy
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

istio-testing · 2022-04-20T01:08:01Z

In response to a cherrypick label: new issue created for failed cherrypick: #38462

istio-testing · 2022-04-20T01:08:02Z

In response to a cherrypick label: #38438 failed to apply on top of branch "release-1.13":

Applying: Fix consistent hash based on source IP for TCP proxy
Using index info to reconstruct a base tree...
M	pilot/pkg/xds/lds.go
M	tests/integration/pilot/common/routing.go
Falling back to patching base and 3-way merge...
Auto-merging tests/integration/pilot/common/routing.go
Auto-merging pilot/pkg/xds/lds.go
CONFLICT (content): Merge conflict in pilot/pkg/xds/lds.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix consistent hash based on source IP for TCP proxy
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

istio-testing · 2022-04-20T01:08:04Z

In response to a cherrypick label: new issue created for failed cherrypick: #38463

istio-testing · 2022-04-20T01:08:37Z

In response to a cherrypick label: #38438 failed to apply on top of branch "release-1.12":

Applying: Fix consistent hash based on source IP for TCP proxy
Using index info to reconstruct a base tree...
M	pilot/pkg/xds/lds.go
M	tests/integration/pilot/common/routing.go
Falling back to patching base and 3-way merge...
Auto-merging tests/integration/pilot/common/routing.go
Auto-merging pilot/pkg/xds/lds.go
CONFLICT (content): Merge conflict in pilot/pkg/xds/lds.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix consistent hash based on source IP for TCP proxy
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

istio-testing · 2022-04-20T01:08:39Z

In response to a cherrypick label: new issue created for failed cherrypick: #38464

istio-testing · 2022-04-20T01:08:40Z

In response to a cherrypick label: #38438 failed to apply on top of branch "release-1.13":

Applying: Fix consistent hash based on source IP for TCP proxy
Using index info to reconstruct a base tree...
M	pilot/pkg/xds/lds.go
M	tests/integration/pilot/common/routing.go
Falling back to patching base and 3-way merge...
Auto-merging tests/integration/pilot/common/routing.go
Auto-merging pilot/pkg/xds/lds.go
CONFLICT (content): Merge conflict in pilot/pkg/xds/lds.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix consistent hash based on source IP for TCP proxy
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

istio-testing · 2022-04-20T01:08:42Z

In response to a cherrypick label: new issue created for failed cherrypick: #38465

istio-testing · 2022-04-20T01:09:18Z

In response to a cherrypick label: #38438 failed to apply on top of branch "release-1.13":

Applying: Fix consistent hash based on source IP for TCP proxy
Using index info to reconstruct a base tree...
M	pilot/pkg/xds/lds.go
M	tests/integration/pilot/common/routing.go
Falling back to patching base and 3-way merge...
Auto-merging tests/integration/pilot/common/routing.go
Auto-merging pilot/pkg/xds/lds.go
CONFLICT (content): Merge conflict in pilot/pkg/xds/lds.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix consistent hash based on source IP for TCP proxy
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

istio-testing · 2022-04-20T01:09:20Z

In response to a cherrypick label: new issue created for failed cherrypick: #38466

…evisions We are adding min istio version for tests related to below PRs as this functionalities were not there in previous revisions :- a. gRPC fault injection(istio#39295) b. Ignore port number in domain matching(istio#40475) c. Tunneling outbound traffic :- new tunnel field got introduced(istio#37968) d. Fix consistent hash based on source IP for TCP proxy(istio#38438) e. Traffic policy load balancer API changes(istio#39742)

…evisions (#40892) We are adding min istio version for tests related to below PRs as this functionalities were not there in previous revisions :- a. gRPC fault injection(#39295) b. Ignore port number in domain matching(#40475) c. Tunneling outbound traffic :- new tunnel field got introduced(#37968) d. Fix consistent hash based on source IP for TCP proxy(#38438) e. Traffic policy load balancer API changes(#39742)

…evisions We are adding min istio version for tests related to below PRs as this functionalities were not there in previous revisions :- a. gRPC fault injection(istio#39295) b. Ignore port number in domain matching(istio#40475) c. Tunneling outbound traffic :- new tunnel field got introduced(istio#37968) d. Fix consistent hash based on source IP for TCP proxy(istio#38438) e. Traffic policy load balancer API changes(istio#39742)

…evisions (#40957) We are adding min istio version for tests related to below PRs as this functionalities were not there in previous revisions :- a. gRPC fault injection(#39295) b. Ignore port number in domain matching(#40475) c. Tunneling outbound traffic :- new tunnel field got introduced(#37968) d. Fix consistent hash based on source IP for TCP proxy(#38438) e. Traffic policy load balancer API changes(#39742) Co-authored-by: Hemendra Teli <hemendrat@google.com>

howardjohn added the release-notes-none Indicates a PR that does not require release notes. label Apr 18, 2022

howardjohn assigned ramaraochavali Apr 18, 2022

howardjohn requested a review from a team as a code owner April 18, 2022 22:28

istio-testing added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 18, 2022

hzxuzhonghu approved these changes Apr 19, 2022

View reviewed changes

howardjohn added 2 commits April 19, 2022 08:05

lint

e129074

howardjohn force-pushed the pilot/fix-tcp-source-ip branch from f592788 to e129074 Compare April 19, 2022 15:05

istio-testing added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 19, 2022

istio-testing merged commit b8143b6 into istio:master Apr 19, 2022

hzxuzhonghu added cherrypick/release-1.11 labels Apr 20, 2022

istio-testing mentioned this pull request Apr 20, 2022

[release-1.11] Fix consistent hash based on source IP for TCP proxy #38458

Closed

istio-testing mentioned this pull request Apr 20, 2022

[release-1.11] Fix consistent hash based on source IP for TCP proxy #38459

Closed

istio-testing mentioned this pull request Apr 20, 2022

[release-1.12] Fix consistent hash based on source IP for TCP proxy #38460

Closed

istio-testing mentioned this pull request Apr 20, 2022

[release-1.11] Fix consistent hash based on source IP for TCP proxy #38461

Closed

istio-testing mentioned this pull request Apr 20, 2022

[release-1.12] Fix consistent hash based on source IP for TCP proxy #38462

Closed

istio-testing mentioned this pull request Apr 20, 2022

[release-1.13] Fix consistent hash based on source IP for TCP proxy #38463

Closed

istio-testing mentioned this pull request Apr 20, 2022

[release-1.12] Fix consistent hash based on source IP for TCP proxy #38464

Closed

istio-testing mentioned this pull request Apr 20, 2022

[release-1.13] Fix consistent hash based on source IP for TCP proxy #38465

Closed

istio-testing mentioned this pull request Apr 20, 2022

[release-1.13] Fix consistent hash based on source IP for TCP proxy #38466

Closed

hemendrateli mentioned this pull request Sep 9, 2022

Adding min istio version for new features to avoid running on older revisions #40892

Merged

10 tasks

Conversation

howardjohn commented Apr 18, 2022 • edited by istio-policy-bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

istio-policy-bot commented Apr 18, 2022

Uh oh!

hzxuzhonghu commented Apr 19, 2022

Uh oh!

ericvn commented Apr 19, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

istio-testing commented Apr 20, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

howardjohn commented Apr 18, 2022 •

edited by istio-policy-bot

Loading