fix(JenkinsService): separate Spinnaker*Exceptions to handle retryabl…

…e conditions
spinnaker · Sep 15, 2023 · 520be8a · 520be8a
1 parent fb2cbdb
commit 520be8a
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/jenkins/service/JenkinsService.java b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/jenkins/service/JenkinsService.java
@@ -96,9 +96,8 @@ public JenkinsService(
                 .ignoreException(
                     (e) -> {
                       if (e instanceof SpinnakerHttpException) {
-                        SpinnakerServerException re = (SpinnakerServerException) e;
-                        return re instanceof SpinnakerHttpException
-                            && ((SpinnakerHttpException) re).getResponseCode() == 404;
+                        return e instanceof SpinnakerHttpException
+                            && ((SpinnakerHttpException) e).getResponseCode() == 404;
                       }
                       return false;
                     })
@@ -336,15 +335,17 @@ private Response getPropertyFile(String jobName, Integer buildNumber, String fil
           try {
             return jenkinsClient.getPropertyFile(encode(jobName), buildNumber, fileName);
           } catch (SpinnakerHttpException e) {
-            // retry on network issue, 404 and 5XX
-            if (e instanceof SpinnakerNetworkException
-                || (e instanceof SpinnakerHttpException
-                    && (((SpinnakerHttpException) e).getResponseCode() == 404
-                        || ((SpinnakerHttpException) e).getResponseCode() >= 500))) {
-              throw e;
+            if (e.getResponseCode() == 404 || e.getResponseCode() >= 500) {
+              throw e; // retry on 404 and 5XX
             }
             SpinnakerException ex = new SpinnakerException(e);
-            ex.setRetryable(false);
+            ex.setRetryable(false); // disable retry
+            throw ex;
+          } catch (SpinnakerNetworkException e) {
+            throw e; // retry on network issue
+          } catch (SpinnakerServerException e) {
+            SpinnakerException ex = new SpinnakerException(e);
+            ex.setRetryable(false); // disable retry
             throw ex;
           }
         },