Merge pull request #1280 from spotify/dxia/zk-connection-state

davidxia · web-flow · commit 95c6c11a115d · 2019-09-23T09:47:17.000-04:00
Also set cluster ID when ZK connection state transitions to CONNECTED
diff --git a/helios-services/src/main/java/com/spotify/helios/servicescommon/coordination/DefaultZooKeeperClient.java b/helios-services/src/main/java/com/spotify/helios/servicescommon/coordination/DefaultZooKeeperClient.java
@@ -96,7 +96,7 @@ public void process(WatchedEvent event) {
       @Override
       public void stateChanged(CuratorFramework client, ConnectionState newState) {
         log.info("DefaultZooKeeperClient connection state change - {}", newState);
-        if (newState == ConnectionState.RECONNECTED) {
+        if (newState.isConnected()) {
           checkClusterIdExists(clusterId, "connectionStateListener");
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public void process(WatchedEvent event) {`
`96`	`96`	`@Override`
`97`	`97`	`public void stateChanged(CuratorFramework client, ConnectionState newState) {`
`98`	`98`	`log.info("DefaultZooKeeperClient connection state change - {}", newState);`
`99`		`- if (newState == ConnectionState.RECONNECTED) {`
	`99`	`+ if (newState.isConnected()) {`
`100`	`100`	`checkClusterIdExists(clusterId, "connectionStateListener");`
`101`	`101`	`}`
`102`	`102`	`}`