Merge pull request #1283 from spotify/dxia/rolling-update-zk-log

davidxia · web-flow · commit 027868941755 · 2019-09-25T14:47:41.000-04:00
master: log more info on ZK error when rolling-update fails
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
@@ -676,7 +676,8 @@ public void rollingUpdate(final DeploymentGroup deploymentGroup,
       throw new DeploymentGroupDoesNotExistException(deploymentGroup.getName());
     } catch (final KeeperException e) {
       throw new HeliosRuntimeException(
-          "rolling-update on deployment-group " + deploymentGroup.getName() + " failed", e);
+          "rolling-update on deployment-group " + deploymentGroup.getName() + " failed. "
+          + e.getMessage(), e);
     }
   }
 
@@ -836,7 +837,8 @@ public void rollingUpdateStep() {
             log.info("rolling-update step on deployment-group was processed by another master"
                      + ": name={}, zookeeper operations={}", deploymentGroupName, ops);
           } catch (KeeperException e) {
-            log.error("rolling-update on deployment-group {} failed", deploymentGroupName, e);
+            log.error("rolling-update on deployment-group {} failed. {}", deploymentGroupName,
+                e.getMessage(), e);
           }
         }
       } catch (final Exception e) {

Original file line number	Diff line number	Diff line change
`@@ -676,7 +676,8 @@ public void rollingUpdate(final DeploymentGroup deploymentGroup,`
`676`	`676`	`throw new DeploymentGroupDoesNotExistException(deploymentGroup.getName());`
`677`	`677`	`} catch (final KeeperException e) {`
`678`	`678`	`throw new HeliosRuntimeException(`
`679`		`- "rolling-update on deployment-group " + deploymentGroup.getName() + " failed", e);`
	`679`	`+ "rolling-update on deployment-group " + deploymentGroup.getName() + " failed. "`
	`680`	`+ + e.getMessage(), e);`
`680`	`681`	`}`
`681`	`682`	`}`
`682`	`683`
`@@ -836,7 +837,8 @@ public void rollingUpdateStep() {`
`836`	`837`	`log.info("rolling-update step on deployment-group was processed by another master"`
`837`	`838`	`+ ": name={}, zookeeper operations={}", deploymentGroupName, ops);`
`838`	`839`	`} catch (KeeperException e) {`
`839`		`- log.error("rolling-update on deployment-group {} failed", deploymentGroupName, e);`
	`840`	`+ log.error("rolling-update on deployment-group {} failed. {}", deploymentGroupName,`
	`841`	`+ e.getMessage(), e);`
`840`	`842`	`}`
`841`	`843`	`}`
`842`	`844`	`} catch (final Exception e) {`