migrate github.com/docker/docker/pkg/signal#69
Closed
thaJeztah wants to merge 100 commits intomoby:masterfrom
Closed
migrate github.com/docker/docker/pkg/signal#69thaJeztah wants to merge 100 commits intomoby:masterfrom
thaJeztah wants to merge 100 commits intomoby:masterfrom
Conversation
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <[email protected]> (github: creack)
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <[email protected]> (github: creack)
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <[email protected]> (github: creack)
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <[email protected]> (github: kzys)
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <[email protected]> (github: creack)
Docker-DCO-1.1-Signed-off-by: Andrew Page <[email protected]> (github: tianon)
Fix various MAINTAINERS format inconsistencies
Docker-DCO-1.1-Signed-off-by: Michael Crosby <[email protected]> (github: crosbymichael)
Bump version to v0.11.0
Merge release to master v0.11.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <[email protected]> (github: crosbymichael)
Bump to version v0.11.1
Docker-DCO-1.1-Signed-off-by: Michael Crosby <[email protected]> (github: crosbymichael)
Merge release v0.11.1
Bump version to v0.12.0
Merge release v0.12.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <[email protected]> (github: crosbymichael)
Bump version to v1.0.0
Merge release v1.0.0
as a maintainer. Best of luck on your e-commerce business Guillaume, and thanks for all the great contributions! Docker-DCO-1.1-Signed-off-by: Solomon Hykes <[email protected]> (github: shykes)
…me_on_his_new_business_and_no_longer_available_as_a_maintainer
Merge release v1.0.1
Merge release v1.1.0
Signed-off-by: Solomon Hykes <[email protected]>
Cleanup: refactor shutdown and signal handling facility
Signed-off-by: Michael Crosby <[email protected]>
Exit after receiving SIGTERM
Signed-off-by: Sebastiaan van Stijn <[email protected]>
full diff: gotestyourself/gotest.tools@v2.3.0...v3.0.1 Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
…64el
error log :
signal_test.go:20: assertion failed: error is not nil: Invalid signal: SIGEMT
signal_test.go:22: assertion failed:
When "ParseSignal" function parse sigStr from SignalMap, it find the signal object with key ("SIG"+sigStr). But EMT signal named "SIGEMT" in SignalMap structrue, so the real key is "SIGSIGEMT" , and cannot find the target signal.
modify "SIGEMT" to "EMT" in SignalMap structrue.
Signed-off-by: liuxiaodong <[email protected]>
TestCatchAll, TestStopCatch: remove unneeded goroutine
Do not handle SIGURG on Linux, as in go1.14+, the go runtime issues
SIGURG as an interrupt to support preemptable system calls on Linux.
This issue was caught in TestCatchAll, which could fail when updating to Go 1.14 or above;
=== Failed
=== FAIL: pkg/signal TestCatchAll (0.01s)
signal_linux_test.go:32: assertion failed: urgent I/O condition (string) != continued (string)
signal_linux_test.go:32: assertion failed: continued (string) != hangup (string)
signal_linux_test.go:32: assertion failed: hangup (string) != child exited (string)
signal_linux_test.go:32: assertion failed: child exited (string) != illegal instruction (string)
signal_linux_test.go:32: assertion failed: illegal instruction (string) != floating point exception (string)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Other Unix platforms (e.g. Darwin) are also affected by the Go runtime sending SIGURG. This patch changes how we match the signal by just looking for the "URG" name, which should handle any platform that has this signal defined in the SignalMap. Signed-off-by: Sebastiaan van Stijn <[email protected]>
Migrating this package from commit: moby/moby@c81abef Strategy taken: # install filter-repo (https://github.com/newren/git-filter-repo/blob/main/INSTALL.md) brew install git-filter-repo cd ~/projects # create a temporary clone of docker git clone https://github.com/docker/docker.git moby_signal cd moby_signal # remove all code, except for pkg/signal, and rename to /signal git filter-repo --path pkg/signal --path-rename pkg/signal:signal # go to the target github.com/moby/sys repository cd ~/projects/moby-sys # create a branch to work with git checkout -b integrate_moby_signal # add the temporary repository as an upstream and make sure it's up-to-date git remote add moby_signal ~/projects/moby_signal git fetch moby_signal # merge the upstream code git merge --allow-unrelated-histories --signoff -S moby_signal/master Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
force-pushed
the
integrate_moby_signal
branch
from
6550a6e to
609d332
Compare
signal_linux_test.go:28:16: Error return value of `syscall.Kill` is not checked (errcheck)
syscall.Kill(syscall.Getpid(), signal)
^
signal_linux_test.go:59:14: Error return value of `syscall.Kill` is not checked (errcheck)
syscall.Kill(syscall.Getpid(), signal)
^
trap.go:59:16: Error return value of `DumpStacks` is not checked (errcheck)
DumpStacks("")
^
trap.go:94:15: Error return value of `f.Sync` is not checked (errcheck)
defer f.Sync()
^
testfiles/main.go:42:14: Error return value of `p.Signal` is not checked (errcheck)
p.Signal(sigmap[s])
^
testfiles/main.go:45:13: Error return value of `p.Signal` is not checked (errcheck)
p.Signal(sigmap[s])
^
testfiles/main.go:48:12: Error return value of `p.Signal` is not checked (errcheck)
p.Signal(sigmap[s])
^
Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
commented
Jul 9, 2021
| } | ||
| } else { | ||
| // 3 SIGTERM/INT signals received; force exit without cleanup | ||
| logger.Info("Forcing docker daemon shutdown without cleanup; 3 interrupts received") |
Member
Author
There was a problem hiding this comment.
This should probably be made more generic
Suggested change
| logger.Info("Forcing docker daemon shutdown without cleanup; 3 interrupts received") | |
| logger.Info("Forcing shutdown; 3 interrupts received") |
| } | ||
| case syscall.SIGQUIT: | ||
| _, _ = DumpStacks("") | ||
| logger.Info("Forcing docker daemon shutdown without cleanup on SIGQUIT") |
Member
Author
There was a problem hiding this comment.
Same for this:
Suggested change
| logger.Info("Forcing docker daemon shutdown without cleanup on SIGQUIT") | |
| logger.Info("Forcing shutdown on SIGQUIT") |
Member
Author
There was a problem hiding this comment.
Or perhaps this whole file should be kept in the moby repository (as it may be quite specific to moby)
Member
Author
|
Some old commits were missing a proper DCO, so I manually marked it to "pass" |
Member
Author
|
I guess this is one to decide (can be done later if we want)
|
This was referenced Jul 9, 2021
Member
Author
|
I'm updating the moby package in moby/moby#42641 to get rid of the things we don't need |
Member
Author
|
closing in favour of (WIP) #70 |
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
20 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.
relates to containerd/containerd#5402
Migrating this package from commit:
moby/moby@c81abef
Strategy taken:
After this: