Skip to content

[Backport release-1.17] default drain_ongoing_call_timeout to None#1017

Merged
sicoyle merged 2 commits into
release-1.17from
backport-1016-to-release-1.17
May 19, 2026
Merged

[Backport release-1.17] default drain_ongoing_call_timeout to None#1017
sicoyle merged 2 commits into
release-1.17from
backport-1016-to-release-1.17

Conversation

@dapr-bot
Copy link
Copy Markdown
Collaborator

@dapr-bot dapr-bot commented May 6, 2026

Backport 77e3bcf from #1016.

* default drain_ongoing_call_timeout to None

ActorRuntimeConfig hardcoded drain_ongoing_call_timeout to 60s. The Dapr
runtime's placement dissemination timeout defaults to 30s and drain blocks
the placement LOCK -> UPDATE -> UNLOCK round, so a 60s drain stalls the
disseminator and resets the placement stream.

Match the other SDKs (.NET, Go, Java, JS) by leaving the field unset, so
daprd applies its 2s default (api.DefaultOngoingCallTimeout). Omit the
field from as_dict() when None so a JSON null is not sent to the runtime.

Signed-off-by: joshvanl <me@joshvanl.dev>

* Update comment

Signed-off-by: joshvanl <me@joshvanl.dev>

---------

Signed-off-by: joshvanl <me@joshvanl.dev>
(cherry picked from commit 77e3bcf)
Signed-off-by: dapr-bot <dapr-bot@users.noreply.github.com>
@sicoyle sicoyle merged commit efbfbde into release-1.17 May 19, 2026
13 checks passed
@sicoyle sicoyle deleted the backport-1016-to-release-1.17 branch May 19, 2026 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants