[09/13] hbase git commit: HBASE-19114 Split out o.a.h.h.zookeeper from hbase-server and hbase-client
http://git-wip-us.apache.org/repos/asf/hbase/blob/e0c4f374/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.java
index d261993..389dea7 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.java
@@ -23,12 +23,12 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.ZooKeeperConnectionException;
+import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.zookeeper.ZKUtil;
import org.apache.hadoop.hbase.zookeeper.ZNodePaths;
-import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
import org.apache.zookeeper.KeeperException;
/**
@@ -42,12 +42,12 @@ class HFileArchiveManager {
private final String archiveZnode;
private static final Log LOG = LogFactory.getLog(HFileArchiveManager.class);
- private final ZooKeeperWatcher zooKeeper;
+ private final ZKWatcher zooKeeper;
private volatile boolean stopped = false;
public HFileArchiveManager(Connection connection, Configuration conf)
throws ZooKeeperConnectionException, IOException {
-this.zooKeeper = new ZooKeeperWatcher(conf, "hfileArchiveManager-on-" +
connection.toString(),
+this.zooKeeper = new ZKWatcher(conf, "hfileArchiveManager-on-" +
connection.toString(),
connection);
this.archiveZnode =
ZKTableArchiveClient.getArchiveZNode(this.zooKeeper.getConfiguration(),
this.zooKeeper);
@@ -104,7 +104,7 @@ class HFileArchiveManager {
* @param table table name on which to enable archiving
* @throws KeeperException
*/
- private void enable(ZooKeeperWatcher zooKeeper, byte[] table)
+ private void enable(ZKWatcher zooKeeper, byte[] table)
throws KeeperException {
LOG.debug("Ensuring archiving znode exists");
ZKUtil.createAndFailSilent(zooKeeper, archiveZnode);
@@ -123,7 +123,7 @@ class HFileArchiveManager {
* @param table name of the table to disable
* @throws KeeperException if an unexpected ZK connection issues occurs
*/
- private void disable(ZooKeeperWatcher zooKeeper, byte[] table) throws
KeeperException {
+ private void disable(ZKWatcher zooKeeper, byte[] table) throws
KeeperException {
// ensure the latest state of the archive node is found
zooKeeper.sync(archiveZnode);
http://git-wip-us.apache.org/repos/asf/hbase/blob/e0c4f374/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.java
index 72c292f..73b50a6 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.java
@@ -22,12 +22,12 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.ZooKeeperConnectionException;
import org.apache.hadoop.hbase.zookeeper.ZKUtil;
-import org.apache.hadoop.hbase.zookeeper.ZooKeeperListener;
-import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
+import org.apache.hadoop.hbase.zookeeper.ZKListener;
import org.apache.zookeeper.KeeperException;
/**
@@ -38,14 +38,14 @@ import org.apache.zookeeper.KeeperException;
* archive.
*/
@InterfaceAudience.Private
-public class TableHFileArchiveTracker extends ZooKeeperListener {
+public class TableHFileArchiveTracker extends ZKListener {
private static final Log LOG =
LogFactory.getLog(TableHFileArchiveTracker.class);
public static final String HFILE_ARCHIVE_ZNODE_PARENT = "hfilearchive";
private HFileArchiveTableMonitor monitor;
private String archiveHFileZNode;
private boolean stopped = false;
- private TableHFileArchiveTracker(ZooKeeperWatcher watcher,
HFileArchiveTableMonitor monitor) {
+ private TableHFileArchiveTracker(ZKWatcher watcher, HFileArchiveTableMonitor
monitor) {
super(watcher);
watcher.registerListener(this);
this.monitor =
[09/13] hbase git commit: HBASE-19114 Split out o.a.h.h.zookeeper from hbase-server and hbase-client
http://git-wip-us.apache.org/repos/asf/hbase/blob/330b0d05/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.java
index d261993..389dea7 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.java
@@ -23,12 +23,12 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.ZooKeeperConnectionException;
+import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.zookeeper.ZKUtil;
import org.apache.hadoop.hbase.zookeeper.ZNodePaths;
-import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
import org.apache.zookeeper.KeeperException;
/**
@@ -42,12 +42,12 @@ class HFileArchiveManager {
private final String archiveZnode;
private static final Log LOG = LogFactory.getLog(HFileArchiveManager.class);
- private final ZooKeeperWatcher zooKeeper;
+ private final ZKWatcher zooKeeper;
private volatile boolean stopped = false;
public HFileArchiveManager(Connection connection, Configuration conf)
throws ZooKeeperConnectionException, IOException {
-this.zooKeeper = new ZooKeeperWatcher(conf, "hfileArchiveManager-on-" +
connection.toString(),
+this.zooKeeper = new ZKWatcher(conf, "hfileArchiveManager-on-" +
connection.toString(),
connection);
this.archiveZnode =
ZKTableArchiveClient.getArchiveZNode(this.zooKeeper.getConfiguration(),
this.zooKeeper);
@@ -104,7 +104,7 @@ class HFileArchiveManager {
* @param table table name on which to enable archiving
* @throws KeeperException
*/
- private void enable(ZooKeeperWatcher zooKeeper, byte[] table)
+ private void enable(ZKWatcher zooKeeper, byte[] table)
throws KeeperException {
LOG.debug("Ensuring archiving znode exists");
ZKUtil.createAndFailSilent(zooKeeper, archiveZnode);
@@ -123,7 +123,7 @@ class HFileArchiveManager {
* @param table name of the table to disable
* @throws KeeperException if an unexpected ZK connection issues occurs
*/
- private void disable(ZooKeeperWatcher zooKeeper, byte[] table) throws
KeeperException {
+ private void disable(ZKWatcher zooKeeper, byte[] table) throws
KeeperException {
// ensure the latest state of the archive node is found
zooKeeper.sync(archiveZnode);
http://git-wip-us.apache.org/repos/asf/hbase/blob/330b0d05/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.java
index 72c292f..73b50a6 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.java
@@ -22,12 +22,12 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.ZooKeeperConnectionException;
import org.apache.hadoop.hbase.zookeeper.ZKUtil;
-import org.apache.hadoop.hbase.zookeeper.ZooKeeperListener;
-import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
+import org.apache.hadoop.hbase.zookeeper.ZKListener;
import org.apache.zookeeper.KeeperException;
/**
@@ -38,14 +38,14 @@ import org.apache.zookeeper.KeeperException;
* archive.
*/
@InterfaceAudience.Private
-public class TableHFileArchiveTracker extends ZooKeeperListener {
+public class TableHFileArchiveTracker extends ZKListener {
private static final Log LOG =
LogFactory.getLog(TableHFileArchiveTracker.class);
public static final String HFILE_ARCHIVE_ZNODE_PARENT = "hfilearchive";
private HFileArchiveTableMonitor monitor;
private String archiveHFileZNode;
private boolean stopped = false;
- private TableHFileArchiveTracker(ZooKeeperWatcher watcher,
HFileArchiveTableMonitor monitor) {
+ private TableHFileArchiveTracker(ZKWatcher watcher, HFileArchiveTableMonitor
monitor) {
super(watcher);
watcher.registerListener(this);
this.monitor =
