You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/04/06 00:02:39 UTC
svn commit: r1310095 - in /hbase/trunk/src:
main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
test/java/org/apache/hadoop/hbase/TestZooKeeper.java
Author: stack
Date: Thu Apr 5 22:02:38 2012
New Revision: 1310095
URL: http://svn.apache.org/viewvc?rev=1310095&view=rev
Log:
HBASE-5711 Tests are failing with incorrect data directory permissions -- REVERT
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java?rev=1310095&r1=1310094&r2=1310095&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java Thu Apr 5 22:02:38 2012
@@ -26,6 +26,7 @@ import java.io.PrintWriter;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Properties;
@@ -35,17 +36,19 @@ import org.apache.commons.logging.LogFac
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.*;
+import org.apache.hadoop.hbase.EmptyWatcher;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.executor.RegionTransitionData;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Threads;
import org.apache.zookeeper.AsyncCallback;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.KeeperException.NoNodeException;
import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.zookeeper.ZooKeeper;
+import org.apache.zookeeper.KeeperException.NoNodeException;
+import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.zookeeper.data.ACL;
import org.apache.zookeeper.data.Stat;
@@ -596,11 +599,13 @@ public class ZKUtil {
ZooKeeperWatcher zkw, String baseNode) throws KeeperException {
List<String> nodes =
ZKUtil.listChildrenAndWatchForNewChildren(zkw, baseNode);
- List<NodeAndData> newNodes = new ArrayList<NodeAndData>();
- for (String node: nodes) {
- String nodePath = ZKUtil.joinZNode(baseNode, node);
- byte [] data = ZKUtil.getDataAndWatch(zkw, nodePath);
- newNodes.add(new NodeAndData(nodePath, data));
+ List<NodeAndData> newNodes = Collections.emptyList();
+ if (nodes != null) {
+ for (String node : nodes) {
+ String nodePath = ZKUtil.joinZNode(baseNode, node);
+ byte[] data = ZKUtil.getDataAndWatch(zkw, nodePath);
+ newNodes.add(new NodeAndData(nodePath, data));
+ }
}
return newNodes;
}
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java?rev=1310095&r1=1310094&r2=1310095&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java Thu Apr 5 22:02:38 2012
@@ -432,9 +432,6 @@ public class HBaseTestingUtility {
// It's also deprecated
System.setProperty("test.cache.data", this.clusterTestDir.toString());
- // Set the permissions for dfs data directories
- this.conf.set("dfs.datanode.data.dir.perm", "700");
-
// Ok, now we can start
this.dfsCluster = new MiniDFSCluster(0, this.conf, servers, true, true,
true, null, null, hosts, null);
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java?rev=1310095&r1=1310094&r2=1310095&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java Thu Apr 5 22:02:38 2012
@@ -342,6 +342,18 @@ public class TestZooKeeper {
ZKUtil.createAndFailSilent(zk2, aclZnode);
}
+
+ @Test
+ /**
+ * Test should not fail with NPE when getChildDataAndWatchForNewChildren
+ * invoked with wrongNode
+ */
+ public void testGetChildDataAndWatchForNewChildrenShouldNotThrowNPE()
+ throws Exception {
+ ZooKeeperWatcher zkw = new ZooKeeperWatcher(TEST_UTIL.getConfiguration(),
+ "testGetChildDataAndWatchForNewChildrenShouldNotThrowNPE", null);
+ ZKUtil.getChildDataAndWatchForNewChildren(zkw, "/wrongNode");
+ }
@org.junit.Rule
public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =