Skip to content

Conversation

@sxllwx
Copy link
Contributor

@sxllwx sxllwx commented Apr 20, 2023

Try to fix the issue: kubernetes/kubernetes#74551

@k8s-ci-robot
Copy link

Hi @sxllwx. Thanks for your PR.

I'm waiting for a containerd 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.

Details

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.

@sxllwx sxllwx force-pushed the fix/k8s-issue-74551 branch from 28755ff to 6e65664 Compare April 20, 2023 02:46
@sxllwx sxllwx marked this pull request as ready for review April 20, 2023 02:46
@sxllwx sxllwx force-pushed the fix/k8s-issue-74551 branch from 6e65664 to f32b64b Compare April 20, 2023 03:22
@sxllwx sxllwx force-pushed the fix/k8s-issue-74551 branch from f32b64b to 4ec346d Compare April 20, 2023 03:26
@sxllwx sxllwx requested a review from dcantah April 20, 2023 06:26
@sxllwx sxllwx force-pushed the fix/k8s-issue-74551 branch from 4ec346d to 4637380 Compare May 19, 2023 02:31
@sxllwx sxllwx changed the title bugfix(port-forward): handle reset error bugfix(port-forward): Correctly handle known errors May 19, 2023
@sxllwx
Copy link
Contributor Author

sxllwx commented May 19, 2023

What else do I need to do to promote this PR?

@dims
Copy link
Member

dims commented May 22, 2023

/ok-to-test

@k8s-ci-robot
Copy link

@dims: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

Details

In response to this:

/ok-to-test

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.

@sxllwx sxllwx force-pushed the fix/k8s-issue-74551 branch from 4637380 to d1837c9 Compare May 22, 2023 06:54
@brianpursley
Copy link
Contributor

I don't think the failing tests are related to this change
/retest

@k8s-ci-robot
Copy link

@brianpursley: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

Details

In response to this:

I don't think the failing tests are related to this change
/retest

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.

@brianpursley
Copy link
Contributor

@dcantah Can we get /ok-to-test on this PR?

There is another kubernetes PR that depends on this PR being merged to fix an issue with port forwarding, so I'm hoping this change can get in.

Do you have any other thoughts on this PR? What else might be needed to move this forward?

Copy link
Member

@dcantah dcantah left a comment

Choose a reason for hiding this comment

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

Yea, the failures are unrelated they're known flakes. I forget if I have permissions to kick off the bot, lets see

@dcantah
Copy link
Member

dcantah commented Jun 14, 2023

/ok-to-test

@brianpursley
Copy link
Contributor

/retest

@orendain
Copy link

Any plans to continue/merge this? @sxllwx @brianpursley

@brianpursley
Copy link
Contributor

Any plans to continue/merge this? @sxllwx @brianpursley

Yes. I hope so, but I'm not sure how to focus attention on this PR.

@sxllwx
Copy link
Contributor Author

sxllwx commented Jul 10, 2023

I've tried to push the PR to be merged via slack and github, but haven't gotten a response yet.😥

@sxllwx
Copy link
Contributor Author

sxllwx commented Jul 11, 2023

What else do I need to do to promote this PR? @dcantah

@dcantah
Copy link
Member

dcantah commented Jul 11, 2023

@sxllwx Nothing more on your end, I apologize for this falling off my radar 🫠. We'll need one other maintainer to approve and we're good to check in. Thanks for your patience

@dcantah
Copy link
Member

dcantah commented Jul 11, 2023

@sxllwx Could you rebase on main and push again so we can get a clearer CI signal?

These two errors can occur in the following scenarios:

ECONNRESET: the target process reset connection between CRI and itself.
see: #111825 for detail

EPIPE: the target process did not read the received data, causing the
buffer in the kernel to be full, resulting in the occurrence of Zero Window,
then closing the connection (FIN, RESET)
see: #74551 for detail

In both cases, we should RESET the httpStream.

Signed-off-by: wangxiang <[email protected]>
@sxllwx sxllwx force-pushed the fix/k8s-issue-74551 branch from d1837c9 to 232538b Compare July 11, 2023 03:06
@sxllwx
Copy link
Contributor Author

sxllwx commented Jul 11, 2023

@sxllwx Could you rebase on main and push again so we can get a clearer CI signal?

Thanks for your support, I've rebase on main and push again. PTAL thx~

@estesp estesp merged commit 0789790 into containerd:main Jul 11, 2023
@estesp estesp added cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Jul 11, 2023
@estesp
Copy link
Member

estesp commented Jul 11, 2023

This fix should be cherry-picked into release/1.6 and release/1.7

@sxllwx
Copy link
Contributor Author

sxllwx commented Jul 12, 2023

This fix should be cherry-picked into release/1.6 and release/1.7

Thanks for your help, I have submitted PRs to do cherry-pick, please take a look. thx

@estesp estesp added cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch and removed cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Jul 12, 2023
@brianpursley
Copy link
Contributor

Thanks, @estesp

Regarding the 1.6 and 1.7 backports, what is the process for getting this into the next patch releases?

I see here, that it says it needs to be added to a milestone

@dcantah
Copy link
Member

dcantah commented Jul 18, 2023

@brianpursley Nothing needs to be done at this point, the next time we go to make a release it will be included. We don't have a set release schedule, just whenever we feel there's decent payload or when there's a security fix. I think this probably justifies a release though so I'll look at getting the notes drafted

@apjoseph
Copy link

@sxllwx @brianpursley is this PR sufficient to solve the SSL port forwarding issue (kubernetes/kubernetes#111825) or is kubernetes/kubernetes#117493 needed as well?

Latest containerd version supported for 1.27 on EKS is 1.6.19 which would mean a mere 3 patch versions stand between EKS users and the ability to use SSL in Postgres again -if this does indeed solve the issue.

@sxllwx
Copy link
Contributor Author

sxllwx commented Sep 26, 2023

@apjoseph

Sorry for the late reply.

This PR is enough to fix kubernetes/kubernetes#74551


We have observed that many non-containerd CRIs use code related to https://github.com/kubernetes/kubernetes/pull/117493/files in kubelet, so we hope to return these bugfixes to kubelet.


If you still encounter problems later, please let me know (of course, you can also let me know if the problem has been solved.). You can leave a message at kubernetes/kubernetes#74551. grateful.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch ok-to-test

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

9 participants