Skip to content
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.

Sign up for GitHub

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

Jump to bottom

core: optimize to reduce excessive onReady() in hedging #8841

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

core: optimize to reduce excessive onReady() in hedging #8841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions core/src/main/java/io/grpc/internal/RetriableStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ private void drain(Substream substream) {
}
if (index == savedState.buffer.size()) { // I'm drained
state = savedState.substreamDrained(substream);
if (!isReady()) {
if (!substream.stream.isReady()) {
return;
}
onReadyRunnable = new Runnable() {
Expand Down Expand Up @@ -1047,9 +1047,10 @@ public void run() {

@Override
public void onReady() {
// FIXME(#7089): hedging case is broken.
if (!isReady()) {
return;
synchronized (lock) {
if (!state.drainedSubstreams.contains(substream)) {
return;
}
}
listenerSerializeExecutor.execute(
new Runnable() {
Expand Down
16 changes: 4 additions & 12 deletions core/src/test/java/io/grpc/internal/RetriableStreamTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1922,7 +1922,6 @@ public Void answer(InvocationOnMock in) {
inOrder.verify(mockStream2, times(2)).flush();
inOrder.verify(mockStream2).writeMessage(any(InputStream.class));
inOrder.verify(mockStream2).request(456);
inOrder.verify(mockStream1).isReady();
inOrder.verify(mockStream2).isReady();
inOrder.verifyNoMoreInteractions();

Expand Down Expand Up @@ -1961,8 +1960,6 @@ public Void answer(InvocationOnMock in) {
inOrder.verify(mockStream3).writeMessage(any(InputStream.class));
inOrder.verify(mockStream3).request(456);
inOrder.verify(mockStream3, times(2)).writeMessage(any(InputStream.class));
inOrder.verify(mockStream1).isReady();
inOrder.verify(mockStream2).isReady();
inOrder.verify(mockStream3).isReady();
inOrder.verifyNoMoreInteractions();

Expand Down Expand Up @@ -2006,8 +2003,6 @@ public Void answer(InvocationOnMock in) {
inOrder.verify(mockStream4).writeMessage(any(InputStream.class));
inOrder.verify(mockStream4).request(456);
inOrder.verify(mockStream4, times(4)).writeMessage(any(InputStream.class));
inOrder.verify(mockStream1).isReady();
inOrder.verify(mockStream2).isReady();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a sign of bad test.

inOrder.verify(mockStream4).isReady();
inOrder.verifyNoMoreInteractions();

Expand Down Expand Up @@ -2320,16 +2315,15 @@ public void hedging_cancelled() {
ArgumentCaptor<ClientStreamListener> sublistenerCaptor1 =
ArgumentCaptor.forClass(ClientStreamListener.class);
inOrder.verify(mockStream1).start(sublistenerCaptor1.capture());
inOrder.verify(mockStream1).isReady();
inOrder.verify(mockStream1).isReady(); // called when substream drained
inOrder.verifyNoMoreInteractions();

fakeClock.forwardTime(HEDGING_DELAY_IN_SECONDS, TimeUnit.SECONDS);
assertEquals(1, fakeClock.numPendingTasks());
ArgumentCaptor<ClientStreamListener> sublistenerCaptor2 =
ArgumentCaptor.forClass(ClientStreamListener.class);
inOrder.verify(mockStream2).start(sublistenerCaptor2.capture());
inOrder.verify(mockStream1).isReady();
inOrder.verify(mockStream2).isReady();
inOrder.verify(mockStream2).isReady(); // called when substream drained
inOrder.verifyNoMoreInteractions();

Status status = Status.CANCELLED.withDescription("cancelled");
Expand Down Expand Up @@ -2369,7 +2363,6 @@ public void hedging_perRpcBufferLimitExceeded() {
ArgumentCaptor<ClientStreamListener> sublistenerCaptor2 =
ArgumentCaptor.forClass(ClientStreamListener.class);
verify(mockStream2).start(sublistenerCaptor2.capture());
verify(mockStream1, times(2)).isReady();
verify(mockStream2).isReady();

ClientStreamTracer bufferSizeTracer2 = bufferSizeTracer;
Expand Down Expand Up @@ -2402,7 +2395,7 @@ public void hedging_channelBufferLimitExceeded() {
ArgumentCaptor<ClientStreamListener> sublistenerCaptor1 =
ArgumentCaptor.forClass(ClientStreamListener.class);
verify(mockStream1).start(sublistenerCaptor1.capture());
verify(mockStream1).isReady();
verify(mockStream1).isReady(); // called when substream drained

ClientStreamTracer bufferSizeTracer1 = bufferSizeTracer;
bufferSizeTracer1.outboundWireSize(100);
Expand All @@ -2411,8 +2404,7 @@ public void hedging_channelBufferLimitExceeded() {
ArgumentCaptor<ClientStreamListener> sublistenerCaptor2 =
ArgumentCaptor.forClass(ClientStreamListener.class);
verify(mockStream2).start(sublistenerCaptor2.capture());
verify(mockStream1, times(2)).isReady();
verify(mockStream2).isReady();
verify(mockStream2).isReady(); // called when substream drained

ClientStreamTracer bufferSizeTracer2 = bufferSizeTracer;
bufferSizeTracer2.outboundWireSize(100);
Expand Down