diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java index 74b413b..64d6085 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java @@ -98,6 +98,11 @@ public class ReplicationAdmin implements Closeable { // be moved to hbase-server. Resolve it in HBASE-11392. private final ReplicationQueuesClient replicationQueuesClient; private final ReplicationPeers replicationPeers; + /** + * A watcher used by replicationPeers and replicationQueuesClient. Keep reference so can dispose + * on {@link #close()}. + */ + private final ZooKeeperWatcher zkw; /** * Constructor that creates a connection to the local ZooKeeper ensemble. @@ -112,7 +117,7 @@ public class ReplicationAdmin implements Closeable { "enable it in order to use replication"); } this.connection = HConnectionManager.getConnection(conf); - ZooKeeperWatcher zkw = createZooKeeperWatcher(); + this.zkw = createZooKeeperWatcher(); try { this.replicationPeers = ReplicationFactory.getReplicationPeers(zkw, conf, this.connection); this.replicationPeers.init(); @@ -126,19 +131,19 @@ public class ReplicationAdmin implements Closeable { } private ZooKeeperWatcher createZooKeeperWatcher() throws IOException { - return new ZooKeeperWatcher(connection.getConfiguration(), - "Replication Admin", new Abortable() { + // This Abortable doesn't 'abort'... it just logs. + return new ZooKeeperWatcher(connection.getConfiguration(), "ReplicationAdmin", new Abortable() { @Override public void abort(String why, Throwable e) { LOG.error(why, e); - System.exit(1); + // We used to call system.exit here but this script can be embedded by other programs that + // want to do replication stuff... so inappropriate calling System.exit. Just log for now. } @Override public boolean isAborted() { return false; } - }); } @@ -451,6 +456,9 @@ public class ReplicationAdmin implements Closeable { @Override public void close() throws IOException { + if (this.zkw != null) { + this.zkw.close(); + } if (this.connection != null) { this.connection.close(); }