fix(saga): Avoid retrying if we get a 404 back from clouddriver (#3880)

spinnaker · Aug 27, 2020 · 22ce747 · 22ce747
1 parent c1a3a89
commit 22ce747
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/...river/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/MonitorKatoTask.groovy b/...river/src/main/groovy/com/netflix/spinnaker/orca/clouddriver/tasks/MonitorKatoTask.groovy
@@ -178,6 +178,14 @@ class MonitorKatoTask implements RetryableTask, CloudProviderAware {
       try {
         kato.resumeTask(katoTask.id)
       } catch (Exception e) {
+        if (e instanceof RetrofitError) {
+          RetrofitError retrofitError = (RetrofitError) e
+          if (retrofitError?.response?.status == 404) {
+            // unexpected -- no sense attempting to resume a saga that `clouddriver` has no knowledge about
+            throw e
+          }
+        }
+
         // Swallow the exception; we'll let Orca retry the next time around.
         log.error("Request failed attempting to resume task", e)
       }