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

OCPBUGS-47658: [release-4.16][manual]: Fix context deadlines in ExecCommandOnPod() #1263

Merged

Conversation

Tal-or
Copy link
Contributor

@Tal-or Tal-or commented Dec 26, 2024

Manual and partial backport of #1189

During testing on x86_64 cluster from an arm64 host, I\'ve
observed strange context deadlines when enabling stdin in
ExecCommandOnPod() function.

Disable stdin as it is not needed during non-interactive tests.

Other changes:
  * Drop unnecessary "/bin/bash -c" in some tests.
    Further cleanup possible, but it could make code
    slightly less readable, so avoiding it for now.

Signed-off-by: Talor Itzhak <[email protected]>
(cherry picked from commit
openshift@0e994c7)
@openshift-ci openshift-ci bot requested review from ffromani and MarSik December 26, 2024 10:11
@Tal-or
Copy link
Contributor Author

Tal-or commented Dec 26, 2024

We should backport this PR up until 4.14.

I see similar symptoms in: openshift-kni/cnf-features-deploy#2135

@Tal-or
Copy link
Contributor Author

Tal-or commented Dec 26, 2024

/cc @yanirq @jmencak

@openshift-ci openshift-ci bot requested review from jmencak and yanirq December 26, 2024 10:12
@yanirq
Copy link
Contributor

yanirq commented Dec 26, 2024

/jira cherry-pick OCPBUGS-43877

@openshift-ci-robot
Copy link
Contributor

@yanirq: Jira Issue OCPBUGS-43877 has been cloned as Jira Issue OCPBUGS-47658. Will retitle bug to link to clone.
/retitle OCPBUGS-47658: [release-4.16][manual]: Fix context deadlines in ExecCommandOnPod()

In response to this:

/jira cherry-pick OCPBUGS-43877

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.16][manual]: Fix context deadlines in ExecCommandOnPod() OCPBUGS-47658: [release-4.16][manual]: Fix context deadlines in ExecCommandOnPod() Dec 26, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Dec 26, 2024
@openshift-ci-robot
Copy link
Contributor

@Tal-or: This pull request references Jira Issue OCPBUGS-47658, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.16.z) matches configured target version for branch (4.16.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-43877 is in the state Closed (Done-Errata), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-43877 targets the "4.17.z" version, which is one of the valid target versions: 4.17.0, 4.17.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

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

In response to this:

Manual and partial backport of #1189

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.

@yanirq
Copy link
Contributor

yanirq commented Dec 26, 2024

/approve
/lgtm

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Dec 26, 2024
@Tal-or
Copy link
Contributor Author

Tal-or commented Dec 26, 2024

/cherry-pick release-4.15

@openshift-cherrypick-robot

@Tal-or: once the present PR merges, I will cherry-pick it on top of release-4.15 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.15

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.

@Tal-or
Copy link
Contributor Author

Tal-or commented Dec 26, 2024

/hold

I want to check if this PR fixes the issue on openshift-kni/cnf-features-deploy#2135

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 26, 2024
Copy link
Contributor

openshift-ci bot commented Dec 26, 2024

@Tal-or: all tests passed!

Full PR test history. Your PR dashboard.

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.

@Tal-or
Copy link
Contributor Author

Tal-or commented Dec 26, 2024

/hold cancel
It does

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 26, 2024
@jmencak
Copy link
Contributor

jmencak commented Dec 26, 2024

Thank you for the backport.
/lgtm
/approve
/backport-risk-assessed

Copy link
Contributor

openshift-ci bot commented Dec 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jmencak, Tal-or, yanirq

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

@mrniranjan
Copy link
Contributor

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Dec 27, 2024
@yanirq
Copy link
Contributor

yanirq commented Dec 29, 2024

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Dec 29, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 5f37137 into openshift:release-4.16 Dec 29, 2024
16 checks passed
@openshift-ci-robot
Copy link
Contributor

@Tal-or: Jira Issue OCPBUGS-47658: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-47658 has been moved to the MODIFIED state.

In response to this:

Manual and partial backport of #1189

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-cherrypick-robot

@Tal-or: #1263 failed to apply on top of branch "release-4.15":

Applying: Fix context deadlines in ExecCommandOnPod()
Using index info to reconstruct a base tree...
M	test/e2e/performanceprofile/functests/utils/nodes/nodes.go
M	test/e2e/performanceprofile/functests/utils/pods/pods.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/performanceprofile/functests/utils/pods/pods.go
CONFLICT (content): Merge conflict in test/e2e/performanceprofile/functests/utils/pods/pods.go
Auto-merging test/e2e/performanceprofile/functests/utils/nodes/nodes.go
CONFLICT (content): Merge conflict in test/e2e/performanceprofile/functests/utils/nodes/nodes.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Fix context deadlines in ExecCommandOnPod()

In response to this:

/cherry-pick release-4.15

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.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: cluster-node-tuning-operator
This PR has been included in build cluster-node-tuning-operator-container-v4.16.0-202412291108.p0.g5f37137.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants