Fix forget_grandchild retain condition #1505
Merged
Conversation
This file contains 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
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #1505 +/- ##
==========================================
- Coverage 34.18% 34.00% -0.18%
==========================================
Files 13 13
Lines 1135 1135
Branches 392 394 +2
==========================================
- Hits 388 386 -2
Misses 493 493
- Partials 254 256 +2 |
Signed-off-by: Martin Michaelis <code@mgjm.de>
mgjm
force-pushed
the
forget-grandchild-retain-condition
branch
from
225c05f
to
94787b5
Compare
saschagrunert
approved these changes
Jul 12, 2023
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mgjm, saschagrunert 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 |
|
/lgtm |
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.
What type of PR is this?
/kind bug
What this PR does / why we need it:
I think the retain condition in
ChildReaper::forget_grandchildwas flipped.The function passed to retain specifies which elements to keep, but the specified condition returned which element we want to remove. (docs)
That results in the removal of all
grandchildrenexcept the one we want to forget.Which issue(s) this PR fixes:
None
Special notes for your reviewer:
I assume that the
forget_grandchildfunction should remove the grandchild withpid == grandchild_pidand not keep it.There could be existing use cases that depend on the fact, that the ChildReaper forgot the wrong grandchildren by accident.
I'm not sure, but it could be the case that conmon-rs didn't terminate spawned childs on exit because of this and will do this now. This could be a braking change? If this is the case, we should mention it in the release note block below.
Does this PR introduce a user-facing change?