diff --git a/common/pom.xml b/common/pom.xml
index 96f1ba8f..6a6df57b 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -22,7 +22,7 @@
zookeeper
- com.github.sgroschupf
+ com.101tec
zkclient
diff --git a/common/src/main/java/com/alibaba/otter/canal/common/zookeeper/ZooKeeperx.java b/common/src/main/java/com/alibaba/otter/canal/common/zookeeper/ZooKeeperx.java
index a3b68dae..14ecfaa3 100644
--- a/common/src/main/java/com/alibaba/otter/canal/common/zookeeper/ZooKeeperx.java
+++ b/common/src/main/java/com/alibaba/otter/canal/common/zookeeper/ZooKeeperx.java
@@ -1,5 +1,18 @@
package com.alibaba.otter.canal.common.zookeeper;
+import org.I0Itec.zkclient.ZkConnection;
+import org.I0Itec.zkclient.exception.ZkException;
+import org.apache.commons.lang.StringUtils;
+import org.apache.zookeeper.ClientCnxn;
+import org.apache.zookeeper.Watcher;
+import org.apache.zookeeper.ZooKeeper;
+import org.apache.zookeeper.client.ConnectStringParser;
+import org.apache.zookeeper.client.HostProvider;
+import org.apache.zookeeper.client.StaticHostProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.ReflectionUtils;
+
import java.io.IOException;
import java.lang.reflect.Field;
import java.net.InetSocketAddress;
@@ -8,44 +21,24 @@ import java.util.List;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import org.I0Itec.zkclient.IZkConnection;
-import org.I0Itec.zkclient.exception.ZkException;
-import org.apache.commons.lang.StringUtils;
-import org.apache.zookeeper.ClientCnxn;
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.ZooDefs.Ids;
-import org.apache.zookeeper.ZooKeeper;
-import org.apache.zookeeper.ZooKeeper.States;
-import org.apache.zookeeper.client.ConnectStringParser;
-import org.apache.zookeeper.client.HostProvider;
-import org.apache.zookeeper.client.StaticHostProvider;
-import org.apache.zookeeper.data.Stat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.ReflectionUtils;
-
/**
* 封装了ZooKeeper，使其支持节点的优先顺序，比如美国机房的节点会优先加载美国对应的zk集群列表，都失败后才会选择加载杭州的zk集群列表 *
*
* @author jianghang 2012-7-10 下午02:31:42
* @version 1.0.0
*/
-public class ZooKeeperx implements IZkConnection {
+public class ZooKeeperx extends ZkConnection {
private static final String SERVER_COMMA = ";";
private static final Logger logger = LoggerFactory.getLogger(ZooKeeperx.class);
private static final Field clientCnxnField = ReflectionUtils.findField(ZooKeeper.class, "cnxn");
private static final Field hostProviderField = ReflectionUtils.findField(ClientCnxn.class, "hostProvider");
- private static final Field serverAddressesField = ReflectionUtils.findField(StaticHostProvider.class,
- "serverAddresses");
+ private static final Field serverAddressesField = ReflectionUtils.findField(StaticHostProvider.class, "serverAddresses");
+ private static final Field zookeeperLockField = ReflectionUtils.findField(ZkConnection.class, "_zookeeperLock");
+ private static final Field zookeeperFiled = ReflectionUtils.findField(ZkConnection.class, "_zk");
private static final int DEFAULT_SESSION_TIMEOUT = 90000;
- private ZooKeeper _zk = null;
- private Lock _zookeeperLock = new ReentrantLock();
-
- private final List _servers;
+ private final List _serversList;
private final int _sessionTimeOut;
public ZooKeeperx(String zkServers){
@@ -53,114 +46,59 @@ public class ZooKeeperx implements IZkConnection {
}
public ZooKeeperx(String zkServers, int sessionTimeOut){
- _servers = Arrays.asList(StringUtils.split(zkServers, SERVER_COMMA));
+ super(zkServers, sessionTimeOut);
+ _serversList = Arrays.asList(StringUtils.split(this.getServers(), SERVER_COMMA));
_sessionTimeOut = sessionTimeOut;
}
@Override
public void connect(Watcher watcher) {
+ ReflectionUtils.makeAccessible(zookeeperLockField);
+ ReflectionUtils.makeAccessible(zookeeperFiled);
+ Lock _zookeeperLock = (ReentrantLock) ReflectionUtils.getField(zookeeperLockField, this);
+ ZooKeeper _zk = (ZooKeeper) ReflectionUtils.getField(zookeeperFiled, this);
+
_zookeeperLock.lock();
try {
if (_zk != null) {
throw new IllegalStateException("zk client has already been started");
}
+ String zkServers = _serversList.get(0);
try {
- logger.debug("Creating new ZookKeeper instance to connect to " + _servers + ".");
- _zk = new ZooKeeper(_servers.get(0), _sessionTimeOut, watcher);
+ logger.debug("Creating new ZookKeeper instance to connect to " + zkServers + ".");
+ _zk = new ZooKeeper(zkServers, _sessionTimeOut, watcher);
configMutliCluster(_zk);
+ ReflectionUtils.setField(zookeeperFiled, this, _zk);
} catch (IOException e) {
- throw new ZkException("Unable to connect to " + _servers, e);
+ throw new ZkException("Unable to connect to " + zkServers, e);
}
} finally {
_zookeeperLock.unlock();
}
}
- public void close() throws InterruptedException {
- _zookeeperLock.lock();
- try {
- if (_zk != null) {
- logger.debug("Closing ZooKeeper connected to " + _servers);
- _zk.close();
- _zk = null;
- }
- } finally {
- _zookeeperLock.unlock();
- }
- }
-
- public String create(String path, byte[] data, CreateMode mode) throws KeeperException, InterruptedException {
- return _zk.create(path, data, Ids.OPEN_ACL_UNSAFE, mode);
- }
-
- public void delete(String path) throws InterruptedException, KeeperException {
- _zk.delete(path, -1);
- }
-
- public boolean exists(String path, boolean watch) throws KeeperException, InterruptedException {
- return _zk.exists(path, watch) != null;
- }
-
- public List getChildren(final String path, final boolean watch) throws KeeperException,
- InterruptedException {
- return _zk.getChildren(path, watch);
- }
-
- public byte[] readData(String path, Stat stat, boolean watch) throws KeeperException, InterruptedException {
- return _zk.getData(path, watch, stat);
- }
-
- public void writeData(String path, byte[] data) throws KeeperException, InterruptedException {
- writeData(path, data, -1);
- }
-
- public void writeData(String path, byte[] data, int version) throws KeeperException, InterruptedException {
- _zk.setData(path, data, version);
- }
-
- public States getZookeeperState() {
- return _zk != null ? _zk.getState() : null;
- }
-
- public ZooKeeper getZookeeper() {
- return _zk;
- }
-
- public long getCreateTime(String path) throws KeeperException, InterruptedException {
- Stat stat = _zk.exists(path, false);
- if (stat != null) {
- return stat.getCtime();
- }
- return -1;
- }
-
- public String getServers() {
- return StringUtils.join(_servers, SERVER_COMMA);
- }
-
// ===============================
public void configMutliCluster(ZooKeeper zk) {
- if (_servers.size() == 1) {
+ if (_serversList.size() == 1) {
return;
}
- String cluster1 = _servers.get(0);
+ String cluster1 = _serversList.get(0);
try {
- if (_servers.size() > 1) {
+ if (_serversList.size() > 1) {
// 强制的声明accessible
ReflectionUtils.makeAccessible(clientCnxnField);
ReflectionUtils.makeAccessible(hostProviderField);
ReflectionUtils.makeAccessible(serverAddressesField);
// 添加第二组集群列表
- for (int i = 1; i < _servers.size(); i++) {
- String cluster = _servers.get(i);
+ for (int i = 1; i < _serversList.size(); i++) {
+ String cluster = _serversList.get(i);
// 强制获取zk中的地址信息
ClientCnxn cnxn = (ClientCnxn) ReflectionUtils.getField(clientCnxnField, zk);
HostProvider hostProvider = (HostProvider) ReflectionUtils.getField(hostProviderField, cnxn);
- List serverAddrs = (List) ReflectionUtils.getField(serverAddressesField,
- hostProvider);
+ List serverAddrs = (List) ReflectionUtils.getField(serverAddressesField, hostProvider);
// 添加第二组集群列表
serverAddrs.addAll(new ConnectStringParser(cluster).getServerAddresses());
}
@@ -178,3 +116,4 @@ public class ZooKeeperx implements IZkConnection {
}
}
+
diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java
index a5ff5b8f..dff994cb 100644
--- a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java
+++ b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java
@@ -149,6 +149,11 @@ public class CanalController {
public void handleNewSession() throws Exception {
initCid(path);
}
+
+ @Override
+ public void handleSessionEstablishmentError(Throwable error) throws Exception {
+ logger.error("failed to connect to zookeeper", error);
+ }
});
}
} finally {
@@ -383,6 +388,11 @@ public class CanalController {
public void handleNewSession() throws Exception {
initCid(path);
}
+
+ @Override
+ public void handleSessionEstablishmentError(Throwable error) throws Exception {
+ logger.error("failed to connect to zookeeper", error);
+ }
});
}
// 优先启动embeded服务
diff --git a/pom.xml b/pom.xml
index 03bec07c..2b991bd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,9 +170,9 @@
- com.github.sgroschupf
+ com.101tec
zkclient
- 0.1
+ 0.10
com.alibaba