Lock KillAll.#2811
Merged
estesp merged 1 commit intocontainerd:masterfrom Nov 20, 2018
Merged
Conversation
Signed-off-by: Lantao Liu <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #2811 +/- ##
==========================================
- Coverage 47.41% 43.73% -3.68%
==========================================
Files 91 100 +9
Lines 8411 10730 +2319
==========================================
+ Hits 3988 4693 +705
- Misses 3700 5307 +1607
- Partials 723 730 +7
Continue to review full report at Codecov.
|
AkihiroSuda
approved these changes
Nov 20, 2018
lifubang
approved these changes
Nov 20, 2018
This was referenced Nov 20, 2018
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
KillAllshould be locked.Previously, it was called in
delete(process state locked) andcheckProcesses(shim locked), both are locked.However, recently we optimized the locks.
checkProcessesdoesn't hold a shim lock for process operations any more.In release/1.2 and HEAD,
KillAllis not called indeleteany more, so we can simply hold a lock inKillAlldirectly.In release/1.1, since
KillAllis still called indelete(process state locked), we need a privatekillAllfunction without process state lock fordelete, and a publicKillAllfunction with lock forcheckProcesses.I'll chery-pick this into supported branches once LGTM.
Signed-off-by: Lantao Liu [email protected]