[v5.4-rhel] Fix: Ensure HealthCheck exec session terminates on timeout #26456
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…sion in the database Fixes: https://issues.redhat.com/browse/RHEL-69970 Fixes: https://issues.redhat.com/browse/RHEL-96916 Fixes: https://issues.redhat.com/browse/RHEL-96917 Signed-off-by: Jan Rodák <[email protected]> (cherry picked from commit ad9839a) Signed-off-by: Jan Rodák <[email protected]>
Previously, the HealthCheck exec session would not terminate on timeout, allowing the healthcheck to run indefinitely. Fixes: https://issues.redhat.com/browse/RHEL-86096 Fixes: https://issues.redhat.com/browse/RHEL-96916 Fixes: https://issues.redhat.com/browse/RHEL-96917 Signed-off-by: Jan Rodák <[email protected]> (cherry picked from commit 499ea11) Signed-off-by: Jan Rodák <[email protected]>
…r timeout is 0 Aligns behavior with documentation stating SIGKILL should be sent immediately if the timeout is zero. Fixes: https://issues.redhat.com/browse/RHEL-96916 Fixes: https://issues.redhat.com/browse/RHEL-96917 Signed-off-by: Jan Rodák <[email protected]> (cherry picked from commit 077649f)
openshift-ci
bot
added
do-not-merge/work-in-progress
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Honny1, lsm5 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 |
openshift-ci
bot
added
the
approved
TomSweeneyRedHat
added
the
do-not-merge/hold
| if err != nil { | ||
| return -1, err | ||
| } | ||
| session.PID = pid |
There was a problem hiding this comment.
In 499ea11#diff-bf52e0a2dfcea051750fa86d05c8a2ce247c66a92a8562570f4d3555d76664a6R872
I'm seeing this line after this one:
session.PIDData = getPidData(pid)
Is that not needed?
There was a problem hiding this comment.
This is not needed because we would have to backport this PR #25906.
TomSweeneyRedHat
removed
the
do-not-merge/hold
|
One Question, otherwise LGTM |
|
/lgtm |
openshift-merge-bot
bot
merged commit f944b21
into
containers:v5.4-rhel
7 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, the HealthCheck exec session would not terminate on timeout, allowing the healthcheck to run indefinitely.
Because Docker does that, Podman should kill the HealthCheck when it reaches the timeout.
In order to backport this patch, you need to backport this patch as well (It is included in this PR):
ExecSessionto the database #25003This Backport contains:
ExecSessionto the database #25003Fixes: https://issues.redhat.com/browse/RHEL-96916
Fixes: https://issues.redhat.com/browse/RHEL-96917
Does this PR introduce a user-facing change?