Adds Daprd option --dapr-block-shutdown-duration
#7268
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
Closes dapr#4313 Docs: dapr/docs#3893 PR adds the `--block-shutdown-seconds` CLI flag and corresponding `dapr.io/block-shutdown-seconds` Kubernetes annotation which configures Daprd to block the graceful shutdown procedure until _either_, the block shutdown seconds has elapsed _or_ the application has become unhealthy, as according to the normal app health status. By default, this option is unset, and therefore there is no effect to the current behaviour of graceful shutdown. When set, Daprd will block the interrupt signal cascading into runtime until the above requirements have been met. The framework process `Cleanup` order has been reversed to mimic `t.Cleanup` and allow the `logline` process to function correctly. Signed-off-by: joshvanl <me@joshvanl.dev>
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #7268 +/- ##
==========================================
+ Coverage 64.51% 64.56% +0.05%
==========================================
Files 225 225
Lines 21070 21103 +33
==========================================
+ Hits 13594 13626 +32
+ Misses 6314 6308 -6
- Partials 1162 1169 +7 ☔ View full report in Codecov by Sentry. |
artursouza
previously approved these changes
Dec 5, 2023
Signed-off-by: joshvanl <me@joshvanl.dev>
Signed-off-by: joshvanl <me@joshvanl.dev>
ItalyPaleAle
requested changes
Dec 5, 2023
cmd/daprd/options/options.go
Outdated
| @@ -109,6 +112,7 @@ func New(args []string) *Options { | |||
| flag.StringVar(&opts.UnixDomainSocket, "unix-domain-socket", "", "Path to a unix domain socket dir mount. If specified, Dapr API servers will use Unix Domain Sockets") | |||
| flag.IntVar(&opts.DaprHTTPReadBufferSize, "dapr-http-read-buffer-size", runtime.DefaultReadBufferSize, "Increasing max size of read buffer in KB to handle sending multi-KB headers") | |||
| flag.IntVar(&opts.DaprGracefulShutdownSeconds, "dapr-graceful-shutdown-seconds", int(runtime.DefaultGracefulShutdownDuration/time.Second), "Graceful shutdown time in seconds") | |||
| flag.IntVar(&blockShutdownSeconds, "dapr-block-shutdown-seconds", 0, "If enabled, will block graceful shutdown after terminate signal is received until either the number of seconds has been reached or the app reports unhealthy. Disabled by default") | |||
There was a problem hiding this comment.
Please don't use "seconds" or other things with complex units. We should standardize on Go durations which allow more flexibility (includng fractions of seconds), at least for new flags. See #7028
There was a problem hiding this comment.
On the other hand, it might be more familiar for K8s users with terminationGracePeriodSeconds.
There was a problem hiding this comment.
I'm happy to use a Go duration instead for the reasons in the issue. Should we move forward with that?
There was a problem hiding this comment.
I've update to use a Go duration- easy enough to revert the commit if we want to in this PR.
artursouza
previously approved these changes
Dec 5, 2023
|
@JoshVanL Please, look at the failing unit and integration tests. |
Signed-off-by: joshvanl <me@joshvanl.dev>
JoshVanL
changed the title
--block-shutdown-seconds--dapr-block-shutdown-duration
yaron2
approved these changes
Dec 6, 2023
DeepanshuA
pushed a commit
to DeepanshuA/dapr
that referenced
this pull request
Dec 11, 2023
* Adds Daprd option `--block-shutdown-seconds` Closes dapr#4313 Docs: dapr/docs#3893 PR adds the `--block-shutdown-seconds` CLI flag and corresponding `dapr.io/block-shutdown-seconds` Kubernetes annotation which configures Daprd to block the graceful shutdown procedure until _either_, the block shutdown seconds has elapsed _or_ the application has become unhealthy, as according to the normal app health status. By default, this option is unset, and therefore there is no effect to the current behaviour of graceful shutdown. When set, Daprd will block the interrupt signal cascading into runtime until the above requirements have been met. The framework process `Cleanup` order has been reversed to mimic `t.Cleanup` and allow the `logline` process to function correctly. Signed-off-by: joshvanl <me@joshvanl.dev> * Revert if check on killing process exec proc cleanup Signed-off-by: joshvanl <me@joshvanl.dev> * Revert error ignore of processes already killed in unix Signed-off-by: joshvanl <me@joshvanl.dev> * Skip shutdown/graceful/block/healthy on windows. * Skip shutdown/block/unhealthy test on windows. * Linting Signed-off-by: joshvanl <me@joshvanl.dev> * Updates `dapr-block-shutdown-seconds` to `dapr-block-shutdown-duration` Signed-off-by: joshvanl <me@joshvanl.dev> --------- Signed-off-by: joshvanl <me@joshvanl.dev> Co-authored-by: Loong Dai <long.dai@intel.com>
JoshVanL
added a commit
to JoshVanL/dapr
that referenced
this pull request
Dec 14, 2023
* Adds Daprd option `--block-shutdown-seconds` Closes dapr#4313 Docs: dapr/docs#3893 PR adds the `--block-shutdown-seconds` CLI flag and corresponding `dapr.io/block-shutdown-seconds` Kubernetes annotation which configures Daprd to block the graceful shutdown procedure until _either_, the block shutdown seconds has elapsed _or_ the application has become unhealthy, as according to the normal app health status. By default, this option is unset, and therefore there is no effect to the current behaviour of graceful shutdown. When set, Daprd will block the interrupt signal cascading into runtime until the above requirements have been met. The framework process `Cleanup` order has been reversed to mimic `t.Cleanup` and allow the `logline` process to function correctly. Signed-off-by: joshvanl <me@joshvanl.dev> * Revert if check on killing process exec proc cleanup Signed-off-by: joshvanl <me@joshvanl.dev> * Revert error ignore of processes already killed in unix Signed-off-by: joshvanl <me@joshvanl.dev> * Skip shutdown/graceful/block/healthy on windows. * Skip shutdown/block/unhealthy test on windows. * Linting Signed-off-by: joshvanl <me@joshvanl.dev> * Updates `dapr-block-shutdown-seconds` to `dapr-block-shutdown-duration` Signed-off-by: joshvanl <me@joshvanl.dev> --------- Signed-off-by: joshvanl <me@joshvanl.dev> Co-authored-by: Loong Dai <long.dai@intel.com>
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.
Closes #4313
Docs: dapr/docs#3893
PR adds the
--dapr-block-shutdown-durationCLI flag and correspondingdapr.io/block-shutdown-durationKubernetes annotation which configures Daprd to block the graceful shutdown procedure until either, the block shutdown duration has elapsed or the application has become unhealthy, as according to the normal app health status.Accepts a Go time duration string.
By default, this option is unset, and therefore there is no effect to the current behaviour of graceful shutdown. When set, Daprd will block the interrupt signal cascading into runtime until the above requirements have been met.
The framework process
Cleanuporder has been reversed as a stack to mimict.Cleanupand allow theloglineprocess to function correctly for exec's which don't exit beforeCleanup.