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

fix: Only check keyHasError if ordering key is non-empty #367

Merged
merged 15 commits into from Sep 29, 2020
Merged

fix: Only check keyHasError if ordering key is non-empty #367

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2b50adb
feat: Add flow control support to publisher
kamalaboulhosn Mar 24, 2020
6bb47bc
make suggested fixes
kamalaboulhosn Mar 25, 2020
0ffda7c
Merge remote-tracking branch 'upstream/master'
kamalaboulhosn May 2, 2020
9c113c3
chore: Remove note that ordering keys requires enablements.
kamalaboulhosn May 2, 2020
2a295c1
Merge remote-tracking branch 'upstream/master'
kamalaboulhosn Jun 21, 2020
6947740
feat: Add support for server-side flow control
kamalaboulhosn Jun 21, 2020
fb08aa3
Revert "chore: Remove note that ordering keys requires enablements."
kamalaboulhosn Jun 21, 2020
304059f
Merge remote-tracking branch 'upstream/master'
kamalaboulhosn Jun 24, 2020
c9c2028
fix: Fix import order
kamalaboulhosn Jun 24, 2020
7b50aa1
Merge remote-tracking branch 'upstream/master' into master
kamalaboulhosn Jul 23, 2020
78ab82d
fix: Make error message more clear about where ordering must be enabl…
kamalaboulhosn Jul 23, 2020
dc62fb7
Merge remote-tracking branch 'upstream/master'
kamalaboulhosn Sep 27, 2020
8b73467
fix: Ensure that messages that are in pending batches for an ordering…
kamalaboulhosn Sep 27, 2020
75dc73e
Merge remote-tracking branch 'upstream/master'
kamalaboulhosn Sep 29, 2020
8be37d7
fix: Only check keyHasError if ordering keys is non-empty
kamalaboulhosn Sep 29, 2020
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 google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
View file
Open in desktop
Expand Up @@ -256,7 +256,7 @@ public ApiFuture<String> publish(PubsubMessage message) {
List<OutstandingBatch> batchesToSend;
messagesBatchLock.lock();
try {
if (sequentialExecutor.keyHasError(orderingKey)) {
if (!orderingKey.isEmpty() && sequentialExecutor.keyHasError(orderingKey)) {
outstandingPublish.publishResult.setException(
SequentialExecutorService.CallbackExecutor.CANCELLATION_EXCEPTION);
return outstandingPublish.publishResult;
Expand Down