core: fix retry flow control issue #8401
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
dapengzhang0
force-pushed
the
fix-retry-flow-control
branch
from
047dfed
to
e43b829
Compare
ejona86
reviewed
Aug 10, 2021
| @@ -64,6 +64,7 @@ | |||
|
|
|||
| private final MethodDescriptor<ReqT, ?> method; | |||
| private final Executor callExecutor; | |||
| private final Executor listenerSerializeExecutor = new SerializeReentrantCallsDirectExecutor(); | |||
There was a problem hiding this comment.
SerializeReentrantCallsDirectExecutor is single-producer (not thread safe). It doesn't work in this case. I think SynchronizationContext is probably better suited.
ejona86
approved these changes
Aug 11, 2021
dapengzhang0
added
the
TODO:backport
dapengzhang0
added a commit
to dapengzhang0/grpc-java
that referenced
this pull request
Aug 12, 2021
There has been an issue about flow control when retry is enabled.
Currently we call `masterListener.onReady()` whenever `substreamListener.onReady()` is called.
The user's `onReady()` implementation might do
```
while(observer.isReady()) {
// send one more message.
}
```
However, currently if the `RetriableStream` is still draining, `isReady()` is false, and user's `onReady()` exits immediately. And because `substreamListener.onReady()` is already called, it may not be called again after drained.
This PR fixes the issue by
- Use a SerializeExecutor to call all `masterListener` callbacks.
- Once `RetriableStream` is drained, check `isReady()` and if so call `onReady()`.
- Once `substreamListener.onReady()` is called, check `isReady()` and only if so we call `masterListener.onReady()`.
dapengzhang0
removed
the
TODO:backport
dapengzhang0
added a commit
that referenced
this pull request
Aug 12, 2021
There has been an issue about flow control when retry is enabled.
Currently we call `masterListener.onReady()` whenever `substreamListener.onReady()` is called.
The user's `onReady()` implementation might do
```
while(observer.isReady()) {
// send one more message.
}
```
However, currently if the `RetriableStream` is still draining, `isReady()` is false, and user's `onReady()` exits immediately. And because `substreamListener.onReady()` is already called, it may not be called again after drained.
This PR fixes the issue by
- Use a SerializeExecutor to call all `masterListener` callbacks.
- Once `RetriableStream` is drained, check `isReady()` and if so call `onReady()`.
- Once `substreamListener.onReady()` is called, check `isReady()` and only if so we call `masterListener.onReady()`.
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.
There has been an issue about flow control when retry is enabled.
Currently we call
masterListener.onReady()wheneversubstreamListener.onReady()is called.The user's
onReady()implementation might doHowever, currently if the
RetriableStreamis still draining,isReady()is false, and user'sonReady()exits immediately. And becausesubstreamListener.onReady()is already called, it may not be called again after drained.This PR fixes the issue by
masterListenercallbacks.RetriableStreamis drained, checkisReady()and if so callonReady().substreamListener.onReady()is called, checkisReady()and only if so we callmasterListener.onReady().