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 fe...@apache.org on 2022/05/12 08:53:18 UTC
[hadoop] branch trunk updated: HDFS-16525.System.err should be used when error occurs in multiple methods in DFSAdmin class (#4122)
This is an automated email from the ASF dual-hosted git repository.
ferhui pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new d74f328b008 HDFS-16525.System.err should be used when error occurs in multiple methods in DFSAdmin class (#4122)
d74f328b008 is described below
commit d74f328b0080517062328baa8114e24950151e59
Author: singer-bin <m1...@163.com>
AuthorDate: Thu May 12 16:53:09 2022 +0800
HDFS-16525.System.err should be used when error occurs in multiple methods in DFSAdmin class (#4122)
---
.../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 20 +--
.../hadoop/hdfs/tools/TestDFSAdminWithHA.java | 200 +++++++++++----------
2 files changed, 115 insertions(+), 105 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
index d435bb6da3e..a9eb5522133 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
@@ -904,7 +904,7 @@ public class DFSAdmin extends FsShell {
+ proxy.getAddress());
}
}catch (IOException ioe){
- System.out.println("Save namespace failed for " +
+ System.err.println("Save namespace failed for " +
proxy.getAddress());
exceptions.add(ioe);
}
@@ -961,7 +961,7 @@ public class DFSAdmin extends FsShell {
System.out.println("restoreFailedStorage is set to " + res + " for "
+ proxy.getAddress());
} catch (IOException ioe){
- System.out.println("restoreFailedStorage failed for "
+ System.err.println("restoreFailedStorage failed for "
+ proxy.getAddress());
exceptions.add(ioe);
}
@@ -1004,7 +1004,7 @@ public class DFSAdmin extends FsShell {
System.out.println("Refresh nodes successful for " +
proxy.getAddress());
}catch (IOException ioe){
- System.out.println("Refresh nodes failed for " +
+ System.err.println("Refresh nodes failed for " +
proxy.getAddress());
exceptions.add(ioe);
}
@@ -1060,7 +1060,7 @@ public class DFSAdmin extends FsShell {
openFilesRemoteIterator = dfs.listOpenFiles(openFilesTypes, path);
printOpenFiles(openFilesRemoteIterator);
} catch (IOException ioe){
- System.out.println("List open files failed.");
+ System.err.println("List open files failed.");
throw ioe;
}
return 0;
@@ -1494,7 +1494,7 @@ public class DFSAdmin extends FsShell {
System.out.println("Finalize upgrade successful for " +
proxy.getAddress());
}catch (IOException ioe){
- System.out.println("Finalize upgrade failed for " +
+ System.err.println("Finalize upgrade failed for " +
proxy.getAddress());
exceptions.add(ioe);
}
@@ -1623,7 +1623,7 @@ public class DFSAdmin extends FsShell {
throw re;
}
} catch (IOException ioe) {
- System.out.println("Created metasave file " + pathname
+ System.err.println("Created metasave file " + pathname
+ " in the log directory of namenode " + proxy.getAddress()
+ " failed");
exceptions.add(ioe);
@@ -1722,7 +1722,7 @@ public class DFSAdmin extends FsShell {
System.out.println("Refresh service acl successful for "
+ proxy.getAddress());
}catch (IOException ioe){
- System.out.println("Refresh service acl failed for "
+ System.err.println("Refresh service acl failed for "
+ proxy.getAddress());
exceptions.add(ioe);
}
@@ -1775,7 +1775,7 @@ public class DFSAdmin extends FsShell {
System.out.println("Refresh user to groups mapping successful for "
+ proxy.getAddress());
}catch (IOException ioe){
- System.out.println("Refresh user to groups mapping failed for "
+ System.err.println("Refresh user to groups mapping failed for "
+ proxy.getAddress());
exceptions.add(ioe);
}
@@ -1830,7 +1830,7 @@ public class DFSAdmin extends FsShell {
System.out.println("Refresh super user groups configuration " +
"successful for " + proxy.getAddress());
}catch (IOException ioe){
- System.out.println("Refresh super user groups configuration " +
+ System.err.println("Refresh super user groups configuration " +
"failed for " + proxy.getAddress());
exceptions.add(ioe);
}
@@ -1879,7 +1879,7 @@ public class DFSAdmin extends FsShell {
System.out.println("Refresh call queue successful for "
+ proxy.getAddress());
}catch (IOException ioe){
- System.out.println("Refresh call queue failed for "
+ System.err.println("Refresh call queue failed for "
+ proxy.getAddress());
exceptions.add(ioe);
}
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java
index 6b8657ccce3..5681f3bdb25 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdminWithHA.java
@@ -69,6 +69,20 @@ public class TestDFSAdminWithHA {
err.reset();
}
+ private void assertOutputMatches(String outMessage, String errMessage) {
+ String errOutput = new String(err.toByteArray(), Charsets.UTF_8);
+ String output = new String(out.toByteArray(), Charsets.UTF_8);
+
+ if (!errOutput.matches(errMessage) || !output.matches(outMessage)) {
+ fail("Expected output to match '" + outMessage + " and " + errMessage +
+ "' but err_output was:\n" + errOutput + "\n and output was: \n" +
+ output);
+ }
+
+ out.reset();
+ err.reset();
+ }
+
private void setHAConf(Configuration conf, String nn1Addr, String nn2Addr) {
conf.set(CommonConfigurationKeysPublic.FS_DEFAULT_NAME_KEY,
"hdfs://" + NSID);
@@ -186,9 +200,9 @@ public class TestDFSAdminWithHA {
//
exitCode = admin.run(new String[] {"-saveNamespace"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- message = "Save namespace successful for.*" + newLine
- + "Save namespace failed for.*" + newLine;
- assertOutputMatches(message);
+ String outMessage = "Save namespace successful for.*" + newLine;
+ String errMessage = "Save namespace failed for ([\\s\\S]*)" + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -204,9 +218,9 @@ public class TestDFSAdminWithHA {
exitCode = admin.run(new String[] {"-saveNamespace"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- message = "Save namespace failed for.*" + newLine
- + "Save namespace successful for.*" + newLine;
- assertOutputMatches(message);
+ String errMessage = "Save namespace failed for ([\\s\\S]*)" + newLine;
+ String outMessage = "Save namespace successful for.*" + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -223,7 +237,7 @@ public class TestDFSAdminWithHA {
exitCode = admin.run(new String[] {"-saveNamespace"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- message = "Save namespace failed for.*";
+ message = "Save namespace failed for ([\\s\\S]*)";
assertOutputMatches(message + newLine + message + newLine);
}
@@ -253,22 +267,22 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(1);
int exitCode = admin.run(new String[] {"-restoreFailedStorage", "check"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "restoreFailedStorage is set to false for.*" + newLine
- + "restoreFailedStorage failed for.*" + newLine;
+ String outMessage = "restoreFailedStorage is set to false for.*" + newLine;
+ String errMessage = "restoreFailedStorage failed for ([\\s\\S]*)" + newLine;
// Default is false
- assertOutputMatches(message);
+ assertOutputMatches(outMessage, errMessage);
exitCode = admin.run(new String[] {"-restoreFailedStorage", "true"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- message = "restoreFailedStorage is set to true for.*" + newLine
- + "restoreFailedStorage failed for.*" + newLine;
- assertOutputMatches(message);
+ outMessage = "restoreFailedStorage is set to true for.*" + newLine;
+ errMessage = "restoreFailedStorage failed for ([\\s\\S]*)" + newLine;
+ assertOutputMatches(outMessage, errMessage);
exitCode = admin.run(new String[] {"-restoreFailedStorage", "false"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- message = "restoreFailedStorage is set to false for.*" + newLine
- + "restoreFailedStorage failed for.*" + newLine;
- assertOutputMatches(message);
+ outMessage = "restoreFailedStorage is set to false for.*" + newLine;
+ errMessage = "restoreFailedStorage failed for ([\\s\\S]*)" + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -277,22 +291,22 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(0);
int exitCode = admin.run(new String[] {"-restoreFailedStorage", "check"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "restoreFailedStorage failed for.*" + newLine
- + "restoreFailedStorage is set to false for.*" + newLine;
+ String errMessage = "restoreFailedStorage failed for ([\\s\\S]*)" + newLine;
+ String outMessage = "restoreFailedStorage is set to false for.*" + newLine;
// Default is false
- assertOutputMatches(message);
+ assertOutputMatches(outMessage, errMessage);
exitCode = admin.run(new String[] {"-restoreFailedStorage", "true"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- message = "restoreFailedStorage failed for.*" + newLine
- + "restoreFailedStorage is set to true for.*" + newLine;
- assertOutputMatches(message);
+ errMessage = "restoreFailedStorage failed for ([\\s\\S]*)" + newLine;
+ outMessage = "restoreFailedStorage is set to true for.*" + newLine;
+ assertOutputMatches(outMessage, errMessage);
exitCode = admin.run(new String[] {"-restoreFailedStorage", "false"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- message = "restoreFailedStorage failed for.*" + newLine
- + "restoreFailedStorage is set to false for.*" + newLine;
- assertOutputMatches(message);
+ errMessage = "restoreFailedStorage failed for ([\\s\\S]*)" + newLine;
+ outMessage = "restoreFailedStorage is set to false for.*" + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -302,18 +316,18 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(1);
int exitCode = admin.run(new String[] {"-restoreFailedStorage", "check"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "restoreFailedStorage failed for.*";
+ String message = "restoreFailedStorage failed for ([\\s\\S]*)";
// Default is false
assertOutputMatches(message + newLine + message + newLine);
exitCode = admin.run(new String[] {"-restoreFailedStorage", "true"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- message = "restoreFailedStorage failed for.*";
+ message = "restoreFailedStorage failed for ([\\s\\S]*)";
assertOutputMatches(message + newLine + message + newLine);
exitCode = admin.run(new String[] {"-restoreFailedStorage", "false"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- message = "restoreFailedStorage failed for.*";
+ message = "restoreFailedStorage failed for ([\\s\\S]*)";
assertOutputMatches(message + newLine + message + newLine);
}
@@ -332,9 +346,9 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(1);
int exitCode = admin.run(new String[] {"-refreshNodes"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Refresh nodes successful for.*" + newLine
- + "Refresh nodes failed for.*" + newLine;
- assertOutputMatches(message);
+ String outMessage = "Refresh nodes successful for .*" + newLine;
+ String errMessage = "Refresh nodes failed for ([\\s\\S]*)" + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -343,9 +357,9 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(0);
int exitCode = admin.run(new String[] {"-refreshNodes"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Refresh nodes failed for.*" + newLine
- + "Refresh nodes successful for.*" + newLine;
- assertOutputMatches(message);
+ String errMessage = "Refresh nodes failed for ([\\s\\S]*)" + newLine;
+ String outMessage = "Refresh nodes successful for .*" + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -355,7 +369,7 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(1);
int exitCode = admin.run(new String[] {"-refreshNodes"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Refresh nodes failed for.*";
+ String message = "Refresh nodes failed for ([\\s\\S]*)";
assertOutputMatches(message + newLine + message + newLine);
}
@@ -432,11 +446,11 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(1);
int exitCode = admin.run(new String[] {"-metasave", "dfs.meta"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Created metasave file dfs.meta in the log directory"
- + " of namenode.*" + newLine
- + "Created metasave file dfs.meta in the log directory"
- + " of namenode.*failed" + newLine;
- assertOutputMatches(message);
+ String outMessage = "Created metasave file dfs.meta in the log " +
+ "directory of namenode.*" + newLine;
+ String errMessage = "Created metasave file dfs.meta in the log " +
+ "directory of namenode.*failed" + newLine + ".*" + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -446,11 +460,11 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(0);
int exitCode = admin.run(new String[] {"-metasave", "dfs.meta"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Created metasave file dfs.meta in the log directory"
- + " of namenode.*failed" + newLine
- + "Created metasave file dfs.meta in the log directory"
- + " of namenode.*" + newLine;
- assertOutputMatches(message);
+ String errMessage = "Created metasave file dfs.meta in the log " +
+ "directory of namenode.*failed" + newLine + ".*" + newLine;
+ String outMessage = "Created metasave file dfs.meta in the log " +
+ "directory of namenode.*" + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -460,9 +474,8 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(1);
int exitCode = admin.run(new String[] {"-metasave", "dfs.meta"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Created metasave file dfs.meta in the log directory"
- + " of namenode.*failed";
- assertOutputMatches(message + newLine + message + newLine);
+ String message = "([\\s\\S]*)2 exceptions([\\s\\S]*)";
+ assertOutputMatches(message + newLine);
}
@Test (timeout = 30000)
@@ -480,9 +493,9 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(1);
int exitCode = admin.run(new String[] {"-refreshServiceAcl"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Refresh service acl successful for.*" + newLine
- + "Refresh service acl failed for.*" + newLine;
- assertOutputMatches(message);
+ String outMessage = "Refresh service acl successful for.*" + newLine;
+ String errMessage = "Refresh service acl failed for([\\s\\S]*)" + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -491,9 +504,9 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(0);
int exitCode = admin.run(new String[] {"-refreshServiceAcl"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Refresh service acl failed for.*" + newLine
- + "Refresh service acl successful for.*" + newLine;
- assertOutputMatches(message);
+ String errMessage = "Refresh service acl failed for([\\s\\S]*)" + newLine;
+ String outMessage = "Refresh service acl successful for.*" + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -503,8 +516,8 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(1);
int exitCode = admin.run(new String[] {"-refreshServiceAcl"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Refresh service acl failed for.*";
- assertOutputMatches(message + newLine + message + newLine);
+ String message = "([\\s\\S]*)2 exceptions([\\s\\S]*)";
+ assertOutputMatches(message + newLine);
}
@@ -523,11 +536,9 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(1);
int exitCode = admin.run(new String[] {"-refreshUserToGroupsMappings"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Refresh user to groups mapping successful for.*"
- + newLine
- + "Refresh user to groups mapping failed for.*"
- + newLine;
- assertOutputMatches(message);
+ String outMessage = "Refresh user to groups mapping successful for.*" + newLine;
+ String errMessage = "Refresh user to groups mapping failed for([\\s\\S]*)" + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -536,11 +547,9 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(0);
int exitCode = admin.run(new String[] {"-refreshUserToGroupsMappings"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Refresh user to groups mapping failed for.*"
- + newLine
- + "Refresh user to groups mapping successful for.*"
- + newLine;
- assertOutputMatches(message);
+ String errMessage = "Refresh user to groups mapping failed for([\\s\\S]*)" + newLine;
+ String outMessage = "Refresh user to groups mapping successful for.*" + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -550,8 +559,8 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(1);
int exitCode = admin.run(new String[] {"-refreshUserToGroupsMappings"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Refresh user to groups mapping failed for.*";
- assertOutputMatches(message + newLine + message + newLine);
+ String message = "([\\s\\S]*)2 exceptions([\\s\\S]*)";
+ assertOutputMatches(message + newLine);
}
@Test (timeout = 30000)
@@ -572,11 +581,11 @@ public class TestDFSAdminWithHA {
int exitCode = admin.run(
new String[] {"-refreshSuperUserGroupsConfiguration"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Refresh super user groups configuration successful for.*"
- + newLine
- + "Refresh super user groups configuration failed for.*"
- + newLine;
- assertOutputMatches(message);
+ String outMessage = "Refresh super user groups configuration successful for.*"
+ + newLine;
+ String errMessage = "Refresh super user groups configuration failed for([\\s\\S]*)"
+ + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -587,11 +596,11 @@ public class TestDFSAdminWithHA {
int exitCode = admin.run(
new String[] {"-refreshSuperUserGroupsConfiguration"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Refresh super user groups configuration failed for.*"
- + newLine
- + "Refresh super user groups configuration successful for.*"
- + newLine;
- assertOutputMatches(message);
+ String errMessage = "Refresh super user groups configuration failed for([\\s\\S]*)"
+ + newLine;
+ String outMessage = "Refresh super user groups configuration successful for.*"
+ + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -603,8 +612,8 @@ public class TestDFSAdminWithHA {
int exitCode = admin.run(
new String[] {"-refreshSuperUserGroupsConfiguration"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Refresh super user groups configuration failed for.*";
- assertOutputMatches(message + newLine + message + newLine);
+ String message = "([\\s\\S]*)2 exceptions([\\s\\S]*)";
+ assertOutputMatches(message + newLine);
}
@Test (timeout = 30000)
@@ -622,9 +631,9 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(1);
int exitCode = admin.run(new String[] {"-refreshCallQueue"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Refresh call queue successful for.*" + newLine
- + "Refresh call queue failed for.*" + newLine;
- assertOutputMatches(message);
+ String outMessage = "Refresh call queue successful for.*" + newLine;
+ String errMessage = "Refresh call queue failed for([\\s\\S]*)" + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -633,9 +642,9 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(0);
int exitCode = admin.run(new String[] {"-refreshCallQueue"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Refresh call queue failed for.*" + newLine
- + "Refresh call queue successful for.*" + newLine;
- assertOutputMatches(message);
+ String errMessage = "Refresh call queue failed for([\\s\\S]*)" + newLine;
+ String outMessage = "Refresh call queue successful for.*" + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -645,8 +654,8 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(1);
int exitCode = admin.run(new String[] {"-refreshCallQueue"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Refresh call queue failed for.*";
- assertOutputMatches(message + newLine + message + newLine);
+ String message = "([\\s\\S]*)2 exceptions([\\s\\S]*)";
+ assertOutputMatches(message + newLine);
}
@Test (timeout = 30000)
@@ -671,9 +680,9 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().transitionToActive(0);
int exitCode = admin.run(new String[] {"-finalizeUpgrade"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Finalize upgrade successful for .*" + newLine
- + "Finalize upgrade failed for .*" + newLine;
- assertOutputMatches(message);
+ String outMessage = "Finalize upgrade successful for .*" + newLine;
+ String errMessage = "Finalize upgrade failed for ([\\s\\S]*)" + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -683,9 +692,9 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().transitionToActive(1);
int exitCode = admin.run(new String[] {"-finalizeUpgrade"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = "Finalize upgrade failed for .*" + newLine
- + "Finalize upgrade successful for .*" + newLine;
- assertOutputMatches(message);
+ String errMessage = "Finalize upgrade failed for ([\\s\\S]*)" + newLine;
+ String outMessage = "Finalize upgrade successful for .*" + newLine;
+ assertOutputMatches(outMessage, errMessage);
}
@Test (timeout = 30000)
@@ -788,7 +797,8 @@ public class TestDFSAdminWithHA {
cluster.getDfsCluster().shutdownNameNode(1);
int exitCode = admin.run(new String[] {"-listOpenFiles"});
assertNotEquals(err.toString().trim(), 0, exitCode);
- String message = ".*" + newLine + "List open files failed." + newLine;
+ String message = "List open files failed." + newLine
+ + ".*" + newLine;
assertOutputMatches(message);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org