You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2013/05/10 07:50:49 UTC
svn commit: r1480880 - in
/hadoop/common/trunk/hadoop-common-project/hadoop-common: ./
src/test/java/org/apache/hadoop/ha/
Author: suresh
Date: Fri May 10 05:50:48 2013
New Revision: 1480880
URL: http://svn.apache.org/r1480880
Log:
HADOOP-9556. disable HA tests on Windows that fail due to ZooKeeper client connection management bug. Contributed by Chris Nauroth.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElectorRealZK.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverController.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverControllerStress.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1480880&r1=1480879&r2=1480880&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Fri May 10 05:50:48 2013
@@ -170,6 +170,9 @@ Trunk (Unreleased)
HADOOP-8608. Add Configuration API for parsing time durations. (cdouglas)
+ HADOOP-9540. Expose the InMemoryS3 and S3N FilesystemStores implementations
+ for Unit testing. (Hari via stevel)
+
BUG FIXES
HADOOP-9451. Fault single-layer config if node group topology is enabled.
@@ -548,8 +551,9 @@ Trunk (Unreleased)
HADOOP-9483. winutils support for readlink command.
(Arpit Agarwal via suresh)
- HADOOP-9540. Expose the InMemoryS3 and S3N FilesystemStores implementations for Unit testing.
- (Hari via stevel)
+ HADOOP-9556. disable HA tests on Windows that fail due to ZooKeeper client
+ connection management bug. (Chris Nauroth via suresh)
+
Release 2.0.5-beta - UNRELEASED
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElectorRealZK.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElectorRealZK.java?rev=1480880&r1=1480879&r2=1480880&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElectorRealZK.java (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestActiveStandbyElectorRealZK.java Fri May 10 05:50:48 2013
@@ -20,6 +20,7 @@ package org.apache.hadoop.ha;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
import java.util.Collections;
import java.util.UUID;
@@ -28,6 +29,7 @@ import org.apache.commons.logging.impl.L
import org.apache.hadoop.ha.ActiveStandbyElector.ActiveStandbyElectorCallback;
import org.apache.hadoop.ha.ActiveStandbyElector.State;
import org.apache.hadoop.ha.HAZKUtil.ZKAuthInfo;
+import org.apache.hadoop.util.Shell;
import org.apache.log4j.Level;
import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.zookeeper.server.ZooKeeperServer;
@@ -59,6 +61,8 @@ public class TestActiveStandbyElectorRea
@Override
public void setUp() throws Exception {
+ // skip tests on Windows until after resolution of ZooKeeper client bug
+ assumeTrue(!Shell.WINDOWS);
super.setUp();
zkServer = getServer(serverFactory);
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverController.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverController.java?rev=1480880&r1=1480879&r2=1480880&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverController.java (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverController.java Fri May 10 05:50:48 2013
@@ -18,6 +18,7 @@
package org.apache.hadoop.ha;
import static org.junit.Assert.*;
+import static org.junit.Assume.assumeTrue;
import java.security.NoSuchAlgorithmException;
@@ -28,6 +29,7 @@ import org.apache.hadoop.ha.HAServicePro
import org.apache.hadoop.ha.HealthMonitor.State;
import org.apache.hadoop.ha.MiniZKFCCluster.DummyZKFC;
import org.apache.hadoop.test.GenericTestUtils;
+import org.apache.hadoop.util.Shell;
import org.apache.hadoop.util.Time;
import org.apache.log4j.Level;
import org.apache.zookeeper.KeeperException;
@@ -66,6 +68,8 @@ public class TestZKFailoverController ex
@Before
public void setupConfAndServices() {
+ // skip tests on Windows until after resolution of ZooKeeper client bug
+ assumeTrue(!Shell.WINDOWS);
conf = new Configuration();
conf.set(ZKFailoverController.ZK_ACL_KEY, TEST_ACL);
conf.set(ZKFailoverController.ZK_AUTH_KEY, TEST_AUTH_GOOD);
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverControllerStress.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverControllerStress.java?rev=1480880&r1=1480879&r2=1480880&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverControllerStress.java (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverControllerStress.java Fri May 10 05:50:48 2013
@@ -17,10 +17,13 @@
*/
package org.apache.hadoop.ha;
+import static org.junit.Assume.assumeTrue;
+
import java.util.Random;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.util.Shell;
import org.apache.hadoop.util.Time;
import org.junit.After;
import org.junit.Before;
@@ -45,6 +48,8 @@ public class TestZKFailoverControllerStr
@Before
public void setupConfAndServices() throws Exception {
+ // skip tests on Windows until after resolution of ZooKeeper client bug
+ assumeTrue(!Shell.WINDOWS);
conf = new Configuration();
conf.set(ZKFailoverController.ZK_QUORUM_KEY, hostPort);
this.cluster = new MiniZKFCCluster(conf, getServer(serverFactory));
@@ -52,7 +57,9 @@ public class TestZKFailoverControllerStr
@After
public void stopCluster() throws Exception {
- cluster.stop();
+ if (cluster != null) {
+ cluster.stop();
+ }
}
/**