You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2009/07/03 19:31:24 UTC
svn commit: r790970 - in /hadoop/hbase/trunk: ./
src/java/org/apache/hadoop/hbase/master/
src/java/org/apache/hadoop/hbase/regionserver/
src/java/org/apache/hadoop/hbase/zookeeper/ src/test/org/apache/hadoop/hbase/
Author: apurtell
Date: Fri Jul 3 17:31:23 2009
New Revision: 790970
URL: http://svn.apache.org/viewvc?rev=790970&view=rev
Log:
HBASE-1596 Remove WatcherWrapper and have all users of Zookeeper provide a Watcher
Removed:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/zookeeper/WatcherWrapper.java
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestZooKeeper.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=790970&r1=790969&r2=790970&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Fri Jul 3 17:31:23 2009
@@ -431,6 +431,8 @@
HBASE-1385 Revamp TableInputFormat, needs updating to match hadoop 0.20.x
AND remove bit where we can make < maps than regions
(Lars George via Stack)
+ HBASE-1596 Remove WatcherWrapper and have all users of Zookeeper provide a
+ Watcher
OPTIMIZATIONS
HBASE-1412 Change values for delete column and column family in KeyValue
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java?rev=790970&r1=790969&r2=790970&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java Fri Jul 3 17:31:23 2009
@@ -88,6 +88,8 @@
import org.apache.hadoop.ipc.RemoteException;
import org.apache.hadoop.net.DNS;
import org.apache.hadoop.util.StringUtils;
+import org.apache.zookeeper.WatchedEvent;
+import org.apache.zookeeper.Watcher;
/**
* HMaster is the "master server" for a HBase.
@@ -98,7 +100,7 @@
* sleep time which is invariant.
*/
public class HMaster extends Thread implements HConstants, HMasterInterface,
- HMasterRegionInterface {
+ HMasterRegionInterface, Watcher {
static final Log LOG = LogFactory.getLog(HMaster.class.getName());
@@ -242,7 +244,7 @@
this.sleeper = new Sleeper(this.threadWakeFrequency, this.closed);
- zooKeeperWrapper = new ZooKeeperWrapper(conf);
+ zooKeeperWrapper = new ZooKeeperWrapper(conf, this);
zkMasterAddressWatcher = new ZKMasterAddressWatcher(this);
serverManager = new ServerManager(this);
regionManager = new RegionManager(this);
@@ -1168,4 +1170,12 @@
public static void main(String [] args) {
doMain(args, HMaster.class);
}
+
+ /**
+ * @see org.apache.zookeeper.Watcher#process(org.apache.zookeeper.WatchedEvent)
+ */
+ @Override
+ public void process(WatchedEvent event) {
+ // TODO: Write me to handle session expired events.
+ }
}
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=790970&r1=790969&r2=790970&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Fri Jul 3 17:31:23 2009
@@ -314,7 +314,7 @@
}
private void reinitializeZooKeeper() throws IOException {
- zooKeeperWrapper = new ZooKeeperWrapper(conf);
+ zooKeeperWrapper = new ZooKeeperWrapper(conf, this);
watchMasterAddress();
}
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java?rev=790970&r1=790969&r2=790970&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWrapper.java Fri Jul 3 17:31:23 2009
@@ -62,7 +62,6 @@
}
private final ZooKeeper zooKeeper;
- private final WatcherWrapper watcher;
private final String parentZNode;
public final String rootRegionZNode;
@@ -74,15 +73,6 @@
/**
* Create a ZooKeeperWrapper.
* @param conf HBaseConfiguration to read settings from.
- * @throws IOException If a connection error occurs.
- */
- public ZooKeeperWrapper(HBaseConfiguration conf) throws IOException {
- this(conf, null);
- }
-
- /**
- * Create a ZooKeeperWrapper.
- * @param conf HBaseConfiguration to read settings from.
* @param watcher ZooKeeper watcher to register.
* @throws IOException If a connection error occurs.
*/
@@ -94,9 +84,8 @@
}
int sessionTimeout = conf.getInt("zookeeper.session.timeout", 10 * 1000);
- this.watcher = new WatcherWrapper(watcher);
try {
- zooKeeper = new ZooKeeper(quorumServers, sessionTimeout, this.watcher);
+ zooKeeper = new ZooKeeper(quorumServers, sessionTimeout, watcher);
} catch (IOException e) {
LOG.error("Failed to create ZooKeeper object: " + e);
throw new IOException(e);
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestZooKeeper.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestZooKeeper.java?rev=790970&r1=790969&r2=790970&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestZooKeeper.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestZooKeeper.java Fri Jul 3 17:31:23 2009
@@ -54,7 +54,7 @@
* @throws IOException
*/
public void testWritesRootRegionLocation() throws IOException {
- ZooKeeperWrapper zooKeeper = new ZooKeeperWrapper(conf);
+ ZooKeeperWrapper zooKeeper = new ZooKeeperWrapper(conf, new EmptyWatcher());
boolean outOfSafeMode = zooKeeper.checkOutOfSafeMode();
assertFalse(outOfSafeMode);
@@ -83,7 +83,7 @@
*/
public void testParentExists() throws IOException {
conf.set("zookeeper.znode.safemode", "/a/b/c/d/e");
- ZooKeeperWrapper zooKeeper = new ZooKeeperWrapper(conf);
+ ZooKeeperWrapper zooKeeper = new ZooKeeperWrapper(conf, new EmptyWatcher());
assertTrue(zooKeeper.writeOutOfSafeMode());
}