Skip to content

Pubsub hp #1483

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
merged 5 commits into from
Dec 21, 2016
Merged

Pubsub hp #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb693bd
Update
davidtorres Dec 19, 2016
0d82897
Addressing feedback
davidtorres Dec 19, 2016
6ef9df7
Addressing the latest comments: mainly refactoring the connection cla…
davidtorres Dec 20, 2016
6b3c738
Fixing a race condition on shutdown
davidtorres Dec 20, 2016
f8c8dc6
Addressing last comments of feedback
davidtorres Dec 21, 2016
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
4 changes: 2 additions & 2 deletions google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/FlowController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ void reserve(int messages, int bytes) throws CloudPubsubFlowControlException {
// Will always allow to send a message even if it is larger than the flow control limit,
// if it doesn't then it will deadlock the thread.
if (outstandingByteCount != null) {
int permitsToDraw = maxOutstandingBytes.get() > bytes ? bytes : maxOutstandingBytes.get();
int permitsToDraw = Math.min(bytes, maxOutstandingBytes.get());
if (!failOnLimits) {
outstandingByteCount.acquireUninterruptibly(permitsToDraw);
} else if (!outstandingByteCount.tryAcquire(permitsToDraw)) {
Expand All @@ -76,7 +76,7 @@ void release(int messages, int bytes) {
}
if (outstandingByteCount != null) {
// Need to return at most as much bytes as it can be drawn.
int permitsToReturn = maxOutstandingBytes.get() > bytes ? bytes : maxOutstandingBytes.get();
int permitsToReturn = Math.min(bytes, maxOutstandingBytes.get());
outstandingByteCount.release(permitsToReturn);
}
}
Expand Down
Loading