-
Notifications
You must be signed in to change notification settings - Fork 146
fix(ext-workflow): honor DAPR_GRPC_MAX_INBOUND_MESSAGE_SIZE_BYTES on workflow channels #1085
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
tezizzm
wants to merge
1
commit into
dapr:main
Choose a base branch
from
tezizzm:fix/workflow-grpc-max-message-size
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -13,11 +13,40 @@ | |||||||||||||||||||||||||||||
| limitations under the License. | ||||||||||||||||||||||||||||||
| """ | ||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
| from typing import Optional | ||||||||||||||||||||||||||||||
| from typing import Any, Optional, Sequence | ||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
| from dapr.conf import settings | ||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
| def get_grpc_channel_options( | ||||||||||||||||||||||||||||||
| max_grpc_message_length: Optional[int] = None, | ||||||||||||||||||||||||||||||
| ) -> Optional[Sequence[tuple[str, Any]]]: | ||||||||||||||||||||||||||||||
| """Resolves gRPC channel options for the workflow message-size limit. | ||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
| Resolution order: the explicit ``max_grpc_message_length`` kwarg, then | ||||||||||||||||||||||||||||||
| ``settings.DAPR_GRPC_MAX_INBOUND_MESSAGE_SIZE_BYTES``, else ``None``. | ||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
| Sets BOTH send and receive limits symmetrically because workflow activity | ||||||||||||||||||||||||||||||
| payloads cross the channel in both directions. ``None`` is returned when no | ||||||||||||||||||||||||||||||
| limit is configured, preserving the gRPC default behavior. | ||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
| Args: | ||||||||||||||||||||||||||||||
| max_grpc_message_length: Explicit max gRPC message size in bytes. Takes | ||||||||||||||||||||||||||||||
| precedence over the env-var setting when truthy. | ||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
| Returns: | ||||||||||||||||||||||||||||||
| A sequence of ``(option, value)`` tuples setting both send and receive | ||||||||||||||||||||||||||||||
| limits, or ``None`` when no limit is configured. | ||||||||||||||||||||||||||||||
| """ | ||||||||||||||||||||||||||||||
| size = max_grpc_message_length or settings.DAPR_GRPC_MAX_INBOUND_MESSAGE_SIZE_BYTES or None | ||||||||||||||||||||||||||||||
| if size is None: | ||||||||||||||||||||||||||||||
| return None | ||||||||||||||||||||||||||||||
| return [ | ||||||||||||||||||||||||||||||
| ('grpc.max_send_message_length', size), | ||||||||||||||||||||||||||||||
| ('grpc.max_receive_message_length', size), | ||||||||||||||||||||||||||||||
| ] | ||||||||||||||||||||||||||||||
|
Comment on lines
+41
to
+47
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This allows |
||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
| def getAddress(host: Optional[str] = None, port: Optional[str] = None) -> str: | ||||||||||||||||||||||||||||||
| if not host and not port: | ||||||||||||||||||||||||||||||
| address = settings.DAPR_GRPC_ENDPOINT or ( | ||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't agree with this suggestion.