8000 Remove global synchronization from MessageDispatcher. by dpcollins-google · Pull Request #4620 · googleapis/google-cloud-java · GitHub
[go: up one dir, main page]
Skip to content

Remove global synchronization from MessageDispatcher. #4620

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

Merged
sduskis merged 2 commits into from
Mar 4, 2019
Merged

Remove global synchronization from MessageDispatcher. #4620

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59ef9fb
Remove global synchronization from MessageDispatcher.
dpcollins-google Mar 4, 2019
74e4b4e
Run code format.
dpcollins-google Mar 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 20 additions & 26 deletions ...ients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,38 +365,32 @@ public void processReceivedMessages(List<ReceivedMessage> messages, Runnable don
}

messagesWaiter.incrementPendingMessages(outstandingBatch.messages.size());
synchronized (outstandingMessageBatches) {
outstandingMessageBatches.add(outstandingBatch);
}
outstandingMessageBatches.add(outstandingBatch);
processOutstandingBatches();
}

private void processOutstandingBatches() {
synchronized (outstandingMessageBatches) {
for (OutstandingMessageBatch nextBatch = outstandingMessageBatches.poll();
nextBatch != null;
nextBatch = outstandingMessageBatches.poll()) {
for (OutstandingMessage nextMessage = nextBatch.messages.poll();
nextMessage != null;
nextMessage = nextBatch.messages.poll()) {
try {
// This is a non-blocking flow controller.
flowController.reserve(1, nextMessage.receivedMessage.getMessage().getSerializedSize());
} catch (FlowController.MaxOutstandingElementCountReachedException
| FlowController.MaxOutstandingRequestBytesReachedException flowControlException) {
// Unwind previous changes in the batches outstanding.
nextBatch.messages.addFirst(nextMessage);
outstandingMessageBatches.addFirst(nextBatch);
return;
} catch (FlowControlException unexpectedException) {
throw new IllegalStateException(
"Flow control unexpected exception", unexpectedException);
}
processOutstandingMessage(
nextMessage.receivedMessage.getMessage(), nextMessage.ackHandler);
for (OutstandingMessageBatch nextBatch = outstandingMessageBatches.poll();
nextBatch != null;
nextBatch = outstandingMessageBatches.poll()) {
for (OutstandingMessage nextMessage = nextBatch.messages.poll();
nextMessage != null;
nextMessage = nextBatch.messages.poll()) {
try {
// This is a non-blocking flow controller.
flowController.reserve(1, nextMessage.receivedMessage.getMessage().getSerializedSize());
} catch (FlowController.MaxOutstandingElementCountReachedException
| FlowController.MaxOutstandingRequestBytesReachedException flowControlException) {
// Unwind previous changes in the batches outstanding.
nextBatch.messages.addFirst(nextMessage);
outstandingMessageBatches.addFirst(nextBatch);
return;
} catch (FlowControlException unexpectedException) {
throw new IllegalStateException("Flow control unexpected exception", unexpectedException);
}
nextBatch.doneCallback.run();
processOutstandingMessage(nextMessage.receivedMessage.getMessage(), nextMessage.ackHandler);
}
nextBatch.doneCallback.run();
}
}

Expand Down
0