This repository has been archived by the owner on Apr 29, 2020. It is now read-only.
modified the way to terminate disable script with commandContext #1112
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
yzaccc
force-pushed
the
yangzongkun/use-commandContext-to-terminate-disable-script
branch
2 times, most recently
from
2d34e88
to
1d07449
Compare
ausmith
reviewed
Feb 26, 2019
pkg/hoist/hoist_launchable_test.go
Outdated
| @@ -14,6 +15,8 @@ import ( | |||
| . "github.com/anthonybishopric/gotcha" | |||
| ) | |||
|
|
|||
| var terminationGracePeriod = 1 * time.Hour | |||
There was a problem hiding this comment.
I'm still not thrilled with us defaulting to 1 hour, but I think I lost that battle before I joined 😢
ausmith
previously requested changes
Feb 26, 2019
| @@ -428,7 +431,7 @@ func TestDisableWithFailingDisable(t *testing.T) { | |||
| func TestDisableWithPassingDisable(t *testing.T) { | |||
| // This test's behavior is not dependent on whether the pod is a legacy or uuid pod | |||
| hl, _ := FakeHoistLaunchableForDirLegacyPod("successful_scripts_test_hoist_launchable") | |||
| err := hl.Disable() | |||
| err := hl.Disable(terminationGracePeriod) | |||
There was a problem hiding this comment.
I don't see any tests that are exercising the new termination grace period (and I suggest you use a lower value than 1 hour when you test it 😉 ).
yzaccc
force-pushed
the
yangzongkun/use-commandContext-to-terminate-disable-script
branch
from
1d07449
to
62200b9
Compare
yzaccc
force-pushed
the
yangzongkun/use-commandContext-to-terminate-disable-script
branch
from
62200b9
to
ed91471
Compare
esuen
reviewed
Feb 27, 2019
yzaccc
force-pushed
the
yangzongkun/use-commandContext-to-terminate-disable-script
branch
from
ed91471
to
e2ef222
Compare
ausmith
reviewed
Feb 27, 2019
| @@ -1,2 +1,4 @@ | |||
| #!/bin/bash | |||
| echo "sleeping for 2 second to test termination grace period" | |||
| sleep 0.005 | |||
There was a problem hiding this comment.
The echo and sleep statements don't line up. I'm good with the test being so fast that the sleep can be super short, but can we make the echo match the reality?
yzaccc
force-pushed
the
yangzongkun/use-commandContext-to-terminate-disable-script
branch
from
8a96fec
to
c5cf45c
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
For hosit launchable, terminate the disable script when grace period is met;
for docker launchable, we do not need to terminate the disable process, just unblock the p2-preparer waiting for the disable script, and proceed killing the container.
Also not only for disable script, this commit enables p2 to have termination grace period on any step.