Skip to content

[release-4.22] OCPBUGS-95402: Fix orphaned shell processes in pod terminal on WebSocket disconnect#16694

Open
openshift-cherrypick-robot wants to merge 3 commits into
openshift:release-4.22from
openshift-cherrypick-robot:cherry-pick-16307-to-release-4.22
Open

[release-4.22] OCPBUGS-95402: Fix orphaned shell processes in pod terminal on WebSocket disconnect#16694
openshift-cherrypick-robot wants to merge 3 commits into
openshift:release-4.22from
openshift-cherrypick-robot:cherry-pick-16307-to-release-4.22

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #16307

/assign Leo6Leo

Leo6Leo and others added 3 commits July 1, 2026 12:49
…ket disconnect

When a terminal WebSocket connection drops, the shell process inside the
container was never terminated, leading to accumulation of orphaned
processes. This occurred because gorilla/websocket's Close() only drops
the TCP connection without sending a WebSocket close frame, and no exit
command was sent to the shell.

Send "exit" to the exec STDIN channel and a proper WebSocket close frame
to the Kubernetes API server when the proxy connection closes. Use a
dedicated backendWriteMutex to prevent concurrent writes to the backend
connection, and check the negotiated subprotocol to use the correct
frame encoding.
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
@openshift-ci

openshift-ci Bot commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: openshift-cherrypick-robot
Once this PR has been reviewed and has the lgtm label, please assign therealjon for approval. For more information see the Code Review Process.

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

Details 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

@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-83817 has been cloned as Jira Issue OCPBUGS-95402. Will retitle bug to link to clone.
/retitle [release-4.22] OCPBUGS-95402: Fix orphaned shell processes in pod terminal on WebSocket disconnect

Details

In response to this:

This is an automated cherry-pick of #16307

/assign Leo6Leo

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot changed the title [release-4.22] OCPBUGS-83817: Fix orphaned shell processes in pod terminal on WebSocket disconnect [release-4.22] OCPBUGS-95402: Fix orphaned shell processes in pod terminal on WebSocket disconnect Jul 1, 2026
@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jul 1, 2026
@openshift-ci-robot

Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-95402, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected dependent Jira Issue OCPBUGS-83817 to target a version in 5.0.0, but it targets "5.0.z" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #16307

/assign Leo6Leo

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci

openshift-ci Bot commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-gcp-console b7032bf link true /test e2e-gcp-console

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

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

Labels

component/backend Related to backend jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants