migrate github.com/docker/docker/pkg/signal (take 2)#70
Merged
AkihiroSuda merged 98 commits intomoby:masterfrom Jul 22, 2021
Merged
migrate github.com/docker/docker/pkg/signal (take 2)#70AkihiroSuda merged 98 commits intomoby:masterfrom
AkihiroSuda merged 98 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
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]>
It is not directly related to signal-handling, so can well live in its own package. Also added a variant that doesn't take a directory to write files to, for easier consumption / better match to how it's used. Signed-off-by: Sebastiaan van Stijn <[email protected]>
It's the only location where this is used, and it's quite specific to dockerd (not really a reusable function for external use), so moving it into that package. Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Migrating this package from commit: moby/moby@9a6ff68 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 # exclude the _deprecated.go and README.md git filter-repo --path-glob 'signal/*.md' --path-glob 'signal/*_deprecated.go' --invert-paths # 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_take2 # 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]>
thaJeztah
force-pushed
the
integrate_moby_signal_take2
branch
from
a0e49de to
1e8ecd8
Compare
Member
Author
|
Some old commits were missing a proper DCO, so I manually marked it to "pass" |
Member
Author
|
moby/moby#42641 was merged, so updated this one and moved it out of draft |
Member
|
I was on the fence if we should make a separate module for this, but there is nothing else in moby/sys that this is related to in any way other than it is a more system-y thing, and it probably makes sense to have a different release for it so 👍 |
Member
Author
|
Yes, it's nearing "left-pad" territory, but with recent hassles around go modules, and this package likely to be reasonably "stable", I think it's fine to have it separate. (shouldn't be too much overhead of having it as a separate module) (famous last words) |
AkihiroSuda
approved these changes
Jul 22, 2021
79 tasks
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.
same as #69, but from moby/moby#42641 (not yet merged)
relates to containerd/containerd#5402
Migrating this package from commit (moby/moby#42641):
moby/moby@9a6ff68
Strategy taken:
After this: