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

Disable full push on scale from 1->0->1 #40866

Merged
merged 4 commits into from
Sep 12, 2022

Conversation

howardjohn
Copy link
Member

@howardjohn howardjohn commented Sep 8, 2022

Fixes #39652

This reverts #36882. At the time,
that PR was needed because EDS ServiceAccounts and CDS ServiceAccounts
were decoupled; Since #39133, this is
no longer true, and the fix in 36882 is not needed any longer.

This PR removes the test added in 36882 (since it tests low level
details that are not relevant anymore). It improves the existing
TestEndpointFlipFlops test -- while that test would have caught the
regression, it didn't actually set any service accounts so it was
missed. The update changes it to correctly detect the behavior (it now
fails without this PR, passes with it).

@istio-testing istio-testing added the do-not-merge/work-in-progress Block merging of a PR because it isn't ready yet. label Sep 8, 2022
@istio-testing
Copy link
Collaborator

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@howardjohn
Copy link
Member Author

/test all

@istio-testing istio-testing added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 8, 2022
Fixes istio#39652

This reverts istio#36882. At the time,
that PR was needed because EDS ServiceAccounts and CDS ServiceAccounts
were decoupled; Since istio#39133, this is
no longer true, and the fix in 36882 is not needed any longer.

This PR *removes* the test added in 36882 (since it tests low level
details that are not relevant anymore). It improves the existing
TestEndpointFlipFlops test -- while that test *would* have caught the
regression, it didn't actually set any service accounts so it was
missed. The update changes it to correctly detect the behavior (it now
fails without this PR, passes with it).
@istio-testing istio-testing added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 8, 2022
@howardjohn howardjohn changed the title experiment dropping scale up full pushes Disable full push on scale from 1->0->1 Sep 8, 2022
@howardjohn howardjohn marked this pull request as ready for review September 8, 2022 17:38
@howardjohn howardjohn requested review from a team as code owners September 8, 2022 17:38
@istio-testing istio-testing removed the do-not-merge/work-in-progress Block merging of a PR because it isn't ready yet. label Sep 8, 2022
@hzxuzhonghu
Copy link
Member

cc

Copy link
Member

@hzxuzhonghu hzxuzhonghu left a comment

Choose a reason for hiding this comment

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

Could not see how you diable full push.

@howardjohn
Copy link
Member Author

howardjohn commented Sep 9, 2022 via email

@howardjohn
Copy link
Member Author

howardjohn commented Sep 9, 2022 via email

@hzxuzhonghu
Copy link
Member

In case all pods of a service is down, and at this time another event triggers a full push, we will result in having incorrect cluster.

@howardjohn
Copy link
Member Author

howardjohn commented Sep 9, 2022 via email

@hzxuzhonghu
Copy link
Member

But the cluster upstream tls setting can have the sas of deleted pods, we could know whether they will come back

@howardjohn
Copy link
Member Author

howardjohn commented Sep 9, 2022 via email

@istio-testing istio-testing added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 9, 2022
@istio-testing
Copy link
Collaborator

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

Applying: Disable full push on scale from 1->0->1
Using index info to reconstruct a base tree...
A	pilot/pkg/model/endpointshards.go
M	pilot/pkg/xds/eds_test.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/xds/eds_test.go
CONFLICT (content): Merge conflict in pilot/pkg/xds/eds_test.go
CONFLICT (modify/delete): pilot/pkg/model/endpointshards.go deleted in HEAD and modified in Disable full push on scale from 1->0->1. Version Disable full push on scale from 1->0->1 of pilot/pkg/model/endpointshards.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Disable full push on scale from 1->0->1
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
Copy link
Collaborator

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

@istio-testing
Copy link
Collaborator

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

Applying: Disable full push on scale from 1->0->1
Using index info to reconstruct a base tree...
M	pilot/pkg/model/endpointshards.go
M	pilot/pkg/xds/eds_test.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/xds/eds_test.go
CONFLICT (content): Merge conflict in pilot/pkg/xds/eds_test.go
Auto-merging pilot/pkg/model/endpointshards.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 Disable full push on scale from 1->0->1
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
Copy link
Collaborator

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

@istio-testing
Copy link
Collaborator

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

Applying: Disable full push on scale from 1->0->1
Using index info to reconstruct a base tree...
A	pilot/pkg/model/endpointshards.go
M	pilot/pkg/xds/eds_test.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/xds/eds_test.go
CONFLICT (content): Merge conflict in pilot/pkg/xds/eds_test.go
CONFLICT (modify/delete): pilot/pkg/model/endpointshards.go deleted in HEAD and modified in Disable full push on scale from 1->0->1. Version Disable full push on scale from 1->0->1 of pilot/pkg/model/endpointshards.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Disable full push on scale from 1->0->1
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
Copy link
Collaborator

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

@istio-testing
Copy link
Collaborator

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

Applying: Disable full push on scale from 1->0->1
Using index info to reconstruct a base tree...
M	pilot/pkg/model/endpointshards.go
M	pilot/pkg/xds/eds_test.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/xds/eds_test.go
CONFLICT (content): Merge conflict in pilot/pkg/xds/eds_test.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 Disable full push on scale from 1->0->1
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
Copy link
Collaborator

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

@istio-testing
Copy link
Collaborator

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

Applying: Disable full push on scale from 1->0->1
Using index info to reconstruct a base tree...
M	pilot/pkg/model/endpointshards.go
M	pilot/pkg/xds/eds_test.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/xds/eds_test.go
CONFLICT (content): Merge conflict in pilot/pkg/xds/eds_test.go
Auto-merging pilot/pkg/model/endpointshards.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 Disable full push on scale from 1->0->1
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
Copy link
Collaborator

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

@istio-testing
Copy link
Collaborator

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

Applying: Disable full push on scale from 1->0->1
Using index info to reconstruct a base tree...
A	pilot/pkg/model/endpointshards.go
M	pilot/pkg/xds/eds_test.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/xds/eds_test.go
CONFLICT (content): Merge conflict in pilot/pkg/xds/eds_test.go
CONFLICT (modify/delete): pilot/pkg/model/endpointshards.go deleted in HEAD and modified in Disable full push on scale from 1->0->1. Version Disable full push on scale from 1->0->1 of pilot/pkg/model/endpointshards.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Disable full push on scale from 1->0->1
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
Copy link
Collaborator

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

@istio-testing
Copy link
Collaborator

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

Applying: Disable full push on scale from 1->0->1
Using index info to reconstruct a base tree...
M	pilot/pkg/model/endpointshards.go
M	pilot/pkg/xds/eds_test.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/xds/eds_test.go
CONFLICT (content): Merge conflict in pilot/pkg/xds/eds_test.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 Disable full push on scale from 1->0->1
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
Copy link
Collaborator

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

@howardjohn
Copy link
Member Author

This should not be cherrypicked.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

increased pilot pushes after istiod upgrade from 1.11.8 to 1.12.8
6 participants