You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by vi...@apache.org on 2014/07/17 21:19:00 UTC
svn commit: r1611442 - in
/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt
src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java
Author: vinayakumarb
Date: Thu Jul 17 19:19:00 2014
New Revision: 1611442
URL: http://svn.apache.org/r1611442
Log:
Merged revision(s) 1611441 from hadoop/common/trunk:
HDFS-6693. TestDFSAdminWithHA fails on windows ( Contributed by Vinayakumar B )
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1611442&r1=1611441&r2=1611442&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Thu Jul 17 19:19:00 2014
@@ -72,6 +72,8 @@ Release 2.6.0 - UNRELEASED
HDFS-6478. RemoteException can't be retried properly for non-HA scenario.
(Ming Ma via jing9)
+ HDFS-6693. TestDFSAdminWithHA fails on windows ( vinayakumarb )
+
Release 2.5.0 - UNRELEASED
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java?rev=1611442&r1=1611441&r2=1611442&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java (original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java Thu Jul 17 19:19:00 2014
@@ -21,6 +21,7 @@ import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import com.google.common.base.Charsets;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
@@ -46,6 +47,7 @@ public class TestDFSAdminWithHA {
private PrintStream originErr;
private static final String NSID = "ns1";
+ private static String newLine = System.getProperty("line.separator");
private void assertOutputMatches(String string) {
String errOutput = new String(out.toByteArray(), Charsets.UTF_8);
@@ -99,6 +101,14 @@ public class TestDFSAdminWithHA {
System.err.flush();
System.setOut(originOut);
System.setErr(originErr);
+ if (admin != null) {
+ admin.close();
+ }
+ if (cluster != null) {
+ cluster.shutdown();
+ }
+ out.reset();
+ err.reset();
}
@Test(timeout = 30000)
@@ -108,25 +118,25 @@ public class TestDFSAdminWithHA {
int exitCode = admin.run(new String[] {"-safemode", "enter"});
assertEquals(err.toString().trim(), 0, exitCode);
String message = "Safe mode is ON in.*";
- assertOutputMatches(message + "\n" + message + "\n");
+ assertOutputMatches(message + newLine + message + newLine);
// Get safemode
exitCode = admin.run(new String[] {"-safemode", "get"});
assertEquals(err.toString().trim(), 0, exitCode);
message = "Safe mode is ON in.*";
- assertOutputMatches(message + "\n" + message + "\n");
+ assertOutputMatches(message + newLine + message + newLine);
// Leave safemode
exitCode = admin.run(new String[] {"-safemode", "leave"});
assertEquals(err.toString().trim(), 0, exitCode);
message = "Safe mode is OFF in.*";
- assertOutputMatches(message + "\n" + message + "\n");
+ assertOutputMatches(message + newLine + message + newLine);
// Get safemode
exitCode = admin.run(new String[] {"-safemode", "get"});
assertEquals(err.toString().trim(), 0, exitCode);
message = "Safe mode is OFF in.*";
- assertOutputMatches(message + "\n" + message + "\n");
+ assertOutputMatches(message + newLine + message + newLine);
}
@Test (timeout = 30000)
@@ -136,12 +146,12 @@ public class TestDFSAdminWithHA {
int exitCode = admin.run(new String[] {"-safemode", "enter"});
assertEquals(err.toString().trim(), 0, exitCode);
String message = "Safe mode is ON in.*";
- assertOutputMatches(message + "\n" + message + "\n");
+ assertOutputMatches(message + newLine + message + newLine);
exitCode = admin.run(new String[] {"-saveNamespace"});
assertEquals(err.toString().trim(), 0, exitCode);
message = "Save namespace successful for.*";
- assertOutputMatches(message + "\n" + message + "\n");
+ assertOutputMatches(message + newLine + message + newLine);
}
@Test (timeout = 30000)
@@ -151,17 +161,17 @@ public class TestDFSAdminWithHA {
assertEquals(err.toString().trim(), 0, exitCode);
String message = "restoreFailedStorage is set to false for.*";
// Default is false
- assertOutputMatches(message + "\n" + message + "\n");
+ assertOutputMatches(message + newLine + message + newLine);
exitCode = admin.run(new String[] {"-restoreFailedStorage", "true"});
assertEquals(err.toString().trim(), 0, exitCode);
message = "restoreFailedStorage is set to true for.*";
- assertOutputMatches(message + "\n" + message + "\n");
+ assertOutputMatches(message + newLine + message + newLine);
exitCode = admin.run(new String[] {"-restoreFailedStorage", "false"});
assertEquals(err.toString().trim(), 0, exitCode);
message = "restoreFailedStorage is set to false for.*";
- assertOutputMatches(message + "\n" + message + "\n");
+ assertOutputMatches(message + newLine + message + newLine);
}
@Test (timeout = 30000)
@@ -170,7 +180,7 @@ public class TestDFSAdminWithHA {
int exitCode = admin.run(new String[] {"-refreshNodes"});
assertEquals(err.toString().trim(), 0, exitCode);
String message = "Refresh nodes successful for.*";
- assertOutputMatches(message + "\n" + message + "\n");
+ assertOutputMatches(message + newLine + message + newLine);
}
@Test (timeout = 30000)
@@ -179,7 +189,7 @@ public class TestDFSAdminWithHA {
int exitCode = admin.run(new String[] {"-setBalancerBandwidth", "10"});
assertEquals(err.toString().trim(), 0, exitCode);
String message = "Balancer bandwidth is set to 10 for.*";
- assertOutputMatches(message + "\n" + message + "\n");
+ assertOutputMatches(message + newLine + message + newLine);
}
@Test (timeout = 30000)
@@ -189,7 +199,7 @@ public class TestDFSAdminWithHA {
assertEquals(err.toString().trim(), 0, exitCode);
String message = "Created metasave file dfs.meta in the log directory"
+ " of namenode.*";
- assertOutputMatches(message + "\n" + message + "\n");
+ assertOutputMatches(message + newLine + message + newLine);
}
@Test (timeout = 30000)
@@ -198,7 +208,7 @@ public class TestDFSAdminWithHA {
int exitCode = admin.run(new String[] {"-refreshServiceAcl"});
assertEquals(err.toString().trim(), 0, exitCode);
String message = "Refresh service acl successful for.*";
- assertOutputMatches(message + "\n" + message + "\n");
+ assertOutputMatches(message + newLine + message + newLine);
}
@Test (timeout = 30000)
@@ -207,7 +217,7 @@ public class TestDFSAdminWithHA {
int exitCode = admin.run(new String[] {"-refreshUserToGroupsMappings"});
assertEquals(err.toString().trim(), 0, exitCode);
String message = "Refresh user to groups mapping successful for.*";
- assertOutputMatches(message + "\n" + message + "\n");
+ assertOutputMatches(message + newLine + message + newLine);
}
@Test (timeout = 30000)
@@ -217,7 +227,7 @@ public class TestDFSAdminWithHA {
new String[] {"-refreshSuperUserGroupsConfiguration"});
assertEquals(err.toString().trim(), 0, exitCode);
String message = "Refresh super user groups configuration successful for.*";
- assertOutputMatches(message + "\n" + message + "\n");
+ assertOutputMatches(message + newLine + message + newLine);
}
@Test (timeout = 30000)
@@ -226,6 +236,6 @@ public class TestDFSAdminWithHA {
int exitCode = admin.run(new String[] {"-refreshCallQueue"});
assertEquals(err.toString().trim(), 0, exitCode);
String message = "Refresh call queue successful for.*";
- assertOutputMatches(message + "\n" + message + "\n");
+ assertOutputMatches(message + newLine + message + newLine);
}
}