fix(titus): really ignore not found on terminate (#2766)

spinnaker · Jul 10, 2018 · a97a2a0 · a97a2a0
1 parent 273e3f0
commit a97a2a0
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/...c/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/RegionScopedTitusClient.java b/...c/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/RegionScopedTitusClient.java
@@ -17,6 +17,7 @@
 package com.netflix.spinnaker.clouddriver.titus.client;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.protobuf.Empty;
 import com.netflix.frigga.Names;
 import com.netflix.spectator.api.Registry;
 import com.netflix.spinnaker.clouddriver.titus.TitusException;
@@ -226,17 +227,22 @@ public void terminateTasksAndShrink(TerminateTasksAndShrinkJobRequest terminateT
   }
 
   private void killTaskWithRetry(String id, TerminateTasksAndShrinkJobRequest terminateTasksAndShrinkJob) {
-    try {
-      TitusClientAuthenticationUtil.attachCaller(grpcBlockingStub).killTask(TaskKillRequest.newBuilder().setTaskId(id).setShrink(terminateTasksAndShrinkJob.isShrink()).build());
-    } catch (io.grpc.StatusRuntimeException e) {
-      if (e.getStatus() == Status.NOT_FOUND) {
-        log.warn("Titus task {} not found, continuing with terminate tasks and shrink job request.", id);
-      } else {
-        retrySupport.retry(() ->
-            TitusClientAuthenticationUtil.attachCaller(grpcBlockingStub).killTask(TaskKillRequest.newBuilder().setTaskId(id).setShrink(terminateTasksAndShrinkJob.isShrink()).build())
-          , 2, 1000, false);
-      }
-    }
+      retrySupport.retry(() -> {
+        try {
+          return TitusClientAuthenticationUtil.attachCaller(grpcBlockingStub).killTask(
+            TaskKillRequest.newBuilder()
+              .setTaskId(id)
+              .setShrink(terminateTasksAndShrinkJob.isShrink())
+              .build()
+          );
+        } catch (io.grpc.StatusRuntimeException e) {
+          if (e.getStatus() == Status.NOT_FOUND) {
+            log.warn("Titus task {} not found, continuing with terminate tasks and shrink job request.", id);
+            return Empty.newBuilder().build();
+          }
+          throw e;
+        }
+    }, 3, 1000, false);
   }
 
   @Override