Merge pull request #1181 from spotify/dxia/patch1

Fix NPEs
spotify · Nov 7, 2017 · 2058cb4 · 2058cb4
2 parents f91ed43 + 704dfd5
commit 2058cb4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/helios-services/src/main/java/com/spotify/helios/master/ZooKeeperMasterModel.java b/helios-services/src/main/java/com/spotify/helios/master/ZooKeeperMasterModel.java
@@ -36,6 +36,7 @@
 import static com.spotify.helios.servicescommon.coordination.ZooKeeperOperations.create;
 import static com.spotify.helios.servicescommon.coordination.ZooKeeperOperations.delete;
 import static com.spotify.helios.servicescommon.coordination.ZooKeeperOperations.set;
+import static java.lang.Boolean.TRUE;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonList;
@@ -958,7 +959,10 @@ private RollingUpdateOp rollingUpdateAwaitRunning(final ZooKeeperClient client,
   private boolean isRolloutTimedOut(final ZooKeeperClient client,
                                     final DeploymentGroup deploymentGroup) {
     final String groupName = deploymentGroup.getName();
-    final long groupTimeoutSetting = deploymentGroup.getRolloutOptions().getTimeout();
+    final long groupTimeoutSetting = deploymentGroup.getRolloutOptions() != null
+                                     && deploymentGroup.getRolloutOptions().getTimeout() != null
+                                     ? deploymentGroup.getRolloutOptions().getTimeout()
+                                     : RolloutOptions.getDefault().getTimeout();
     final long secondsSinceDeploy;
     try {
       final String statusPath = Paths.statusDeploymentGroupTasks(groupName);
@@ -1131,7 +1135,8 @@ private boolean ownedByDeploymentGroup(final Deployment deployment,
   }
 
   private boolean isMigration(final Deployment deployment, final DeploymentGroup deploymentGroup) {
-    return (deploymentGroup.getRolloutOptions().getMigrate()
+    return (deploymentGroup.getRolloutOptions() != null
+            && TRUE.equals(deploymentGroup.getRolloutOptions().getMigrate())
             && deployment.getJobId().equals(deploymentGroup.getJobId()));
   }
 

diff --git a/helios-services/src/main/java/com/spotify/helios/rollingupdate/RollingUpdateOpFactory.java b/helios-services/src/main/java/com/spotify/helios/rollingupdate/RollingUpdateOpFactory.java
@@ -27,6 +27,7 @@
 import static com.spotify.helios.servicescommon.coordination.ZooKeeperOperations.create;
 import static com.spotify.helios.servicescommon.coordination.ZooKeeperOperations.delete;
 import static com.spotify.helios.servicescommon.coordination.ZooKeeperOperations.set;
+import static java.lang.Boolean.TRUE;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
@@ -160,7 +161,7 @@ public RollingUpdateOp yield() {
 
   private boolean isIgnoreFailures() {
     return deploymentGroup.getRolloutOptions() != null
-           && deploymentGroup.getRolloutOptions().getIgnoreFailures();
+           && TRUE.equals(deploymentGroup.getRolloutOptions().getIgnoreFailures());
   }
 
   public RollingUpdateOp error(final String msg, final String host,