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

Respect requested message limits within a single MessageProducer in BinderTransport. #9163

Merged
merged 4 commits into from May 16, 2022
Merged

Respect requested message limits within a single MessageProducer in BinderTransport. #9163

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8daca09
Respect requested message limits within a single MessageProducer in B…
akandratovich May 12, 2022
0b4f165
Test for transport respects requested message limits within a single …
akandratovich May 12, 2022
f6ff5b3
Refactor test
akandratovich May 12, 2022
34609fc
Update AbstractTransportTest.java
akandratovich May 12, 2022
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
2 changes: 1 addition & 1 deletion binder/src/main/java/io/grpc/binder/internal/Inbound.java
View file
Open in desktop
Expand Up @@ -468,7 +468,7 @@ public final synchronized InputStream next() {
if (firstMessage != null) {
stream = firstMessage;
firstMessage = null;
} else if (messageAvailable()) {
} else if (numRequestedMessages > 0 && messageAvailable()) {
stream = assembleNextMessage();
}
if (stream != null) {
Expand Down
28 changes: 28 additions & 0 deletions core/src/test/java/io/grpc/internal/AbstractTransportTest.java
View file
Open in desktop
Expand Up @@ -1503,6 +1503,34 @@ private int verifyMessageCountAndClose(BlockingQueue<InputStream> messageQueue,
return count;
}

@Test
public void messageProducerOnlyProducesRequestedMessages() throws Exception {
server.start(serverListener);
client = newClientTransport(server);
startTransport(client, mockClientTransportListener);
MockServerTransportListener serverTransportListener =
serverListener.takeListenerOrFail(TIMEOUT_MS, TimeUnit.MILLISECONDS);
serverTransport = serverTransportListener.transport;

// Start an RPC.
ClientStream clientStream = client.newStream(
methodDescriptor, new Metadata(), callOptions, tracers);
ClientStreamListenerBase clientStreamListener = new ClientStreamListenerBase();
clientStream.start(clientStreamListener);
StreamCreation serverStreamCreation =
serverTransportListener.takeStreamOrFail(TIMEOUT_MS, TimeUnit.MILLISECONDS);
assertEquals(methodDescriptor.getFullMethodName(), serverStreamCreation.method);

// Have the client send two messages.
clientStream.writeMessage(methodDescriptor.streamRequest("MESSAGE"));
clientStream.writeMessage(methodDescriptor.streamRequest("MESSAGE"));
clientStream.flush();

akandratovich marked this conversation as resolved.
Show resolved Hide resolved
// Verify server only receives one message if that's all it requests.
serverStreamCreation.stream.request(1);
verifyMessageCountAndClose(serverStreamCreation.listener.messageQueue, 1);
}

@Test
public void interactionsAfterServerStreamCloseAreNoops() throws Exception {
server.start(serverListener);
Expand Down