---

sduskis · sduskis · commit e9f9678b6e1d · 2019-05-03T09:34:45.000-04:00
yaml --- r: 28283 b: refs/heads/pubsub-ordering-keys c: 5a81613 h: refs/heads/master i: 28281: 35ce695 28279: 06b3d1a
diff --git a/[refs] b/[refs]
@@ -155,7 +155,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
 refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
 refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
 refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
-refs/heads/pubsub-ordering-keys: 6073e7e317625ade532e102957008d589337d236
+refs/heads/pubsub-ordering-keys: 5a81613ddec372b6848806d09c69b337c1ad76f3
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
 refs/tags/v0.77.0: 28a85a77883ccf5d48f297fd0ef3b3dca6ce01f0
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
@@ -142,6 +142,7 @@ private Publisher(Builder builder) throws IOException {
       retrySettingsBuilder.setMaxAttempts(Integer.MAX_VALUE);
     }
     if (enableMessageOrdering) {
+      // TODO: is there a way to have the default retry settings for requests without an ordering key?
       retrySettingsBuilder
           .setMaxAttempts(Integer.MAX_VALUE)
           .setTotalTimeout(Duration.ofNanos(Long.MAX_VALUE));
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SequentialExecutorService.java b/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SequentialExecutorService.java
@@ -223,7 +223,6 @@ public void onSuccess(T msg) {
                       // Step 5.2: on failure
                       @Override
                       public void onFailure(Throwable e) {
-                        keysWithErrors.add(key);
                         future.setException(e);
                         cancelQueuedTasks(key, CANCELLATION_EXCEPTION);
                       }
@@ -250,8 +249,7 @@ void resumePublish(String key) {
 
     /** Cancels every task in the queue associated with {@code key}. */
     private void cancelQueuedTasks(final String key, Throwable e) {
-      // TODO(kimkyung-goog): Ensure execute() fails once cancelQueueTasks() has been ever invoked,
-      // so that no more tasks are scheduled.
+      keysWithErrors.add(key);
       synchronized (tasksByKey) {
         final Queue<CancellableRunnable> tasks = tasksByKey.get(key);
         if (tasks != null) {

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,7 @@ private Publisher(Builder builder) throws IOException {`
`142`	`142`	`retrySettingsBuilder.setMaxAttempts(Integer.MAX_VALUE);`
`143`	`143`	`}`
`144`	`144`	`if (enableMessageOrdering) {`
	`145`	`+ // TODO: is there a way to have the default retry settings for requests without an ordering key?`
`145`	`146`	`retrySettingsBuilder`
`146`	`147`	`.setMaxAttempts(Integer.MAX_VALUE)`
`147`	`148`	`.setTotalTimeout(Duration.ofNanos(Long.MAX_VALUE));`