Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-9474. TestPipelinesFailover should not fail when printing debug message. (John Zhuge via Yongjun Zhang) 

(cherry picked from commit 59dbe8b3e9)
This commit is contained in:
Yongjun Zhang 2015-12-04 13:45:01 -08:00
parent 3beedc177d
commit 78a21e773d
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -846,6 +846,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9490. MiniDFSCluster should change block generation stamp via HDFS-9490. MiniDFSCluster should change block generation stamp via
FsDatasetTestUtils. (Tony Wu via lei) FsDatasetTestUtils. (Tony Wu via lei)
HDFS-9474. TestPipelinesFailover should not fail when printing debug
message. (John Zhuge via Yongjun Zhang)
OPTIMIZATIONS OPTIMIZATIONS
HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than

38
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestPipelinesFailover.java
View File

@ -55,7 +55,7 @@ import org.apache.hadoop.test.GenericTestUtils;
import org.apache.hadoop.test.GenericTestUtils.DelayAnswer; import org.apache.hadoop.test.GenericTestUtils.DelayAnswer;
import org.apache.hadoop.test.MultithreadedTestUtil.RepeatingTestThread; import org.apache.hadoop.test.MultithreadedTestUtil.RepeatingTestThread;
import org.apache.hadoop.test.MultithreadedTestUtil.TestContext; import org.apache.hadoop.test.MultithreadedTestUtil.TestContext;
import org.apache.hadoop.util.Shell; import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.Shell.ShellCommandExecutor; import org.apache.hadoop.util.Shell.ShellCommandExecutor;
import org.apache.log4j.Level; import org.apache.log4j.Level;
import org.junit.Test; import org.junit.Test;
@ -420,29 +420,27 @@ public class TestPipelinesFailover {
// The following section of code is to help debug HDFS-6694 about // The following section of code is to help debug HDFS-6694 about
// this test that fails from time to time due to "too many open files". // this test that fails from time to time due to "too many open files".
// //
LOG.info("HDFS-6694 Debug Data BEGIN");
// Only collect debug data on these OSes. String[][] scmds = new String[][] {
if (Shell.LINUX || Shell.SOLARIS || Shell.MAC) { {"/bin/sh", "-c", "ulimit -a"},
System.out.println("HDFS-6694 Debug Data BEGIN==="); {"hostname"},
{"ifconfig", "-a"}
};
String[] scmd = new String[] {"/bin/sh", "-c", "ulimit -a"}; for (String[] scmd: scmds) {
ShellCommandExecutor sce = new ShellCommandExecutor(scmd); String scmd_str = StringUtils.join(" ", scmd);
sce.execute(); try {
System.out.println("'ulimit -a' output:\n" + sce.getOutput()); ShellCommandExecutor sce = new ShellCommandExecutor(scmd);
sce.execute();
scmd = new String[] {"hostname"}; LOG.info("'" + scmd_str + "' output:\n" + sce.getOutput());
sce = new ShellCommandExecutor(scmd); } catch (IOException e) {
sce.execute(); LOG.warn("Error when running '" + scmd_str + "'", e);
System.out.println("'hostname' output:\n" + sce.getOutput()); }
scmd = new String[] {"ifconfig", "-a"};
sce = new ShellCommandExecutor(scmd);
sce.execute();
System.out.println("'ifconfig' output:\n" + sce.getOutput());
System.out.println("===HDFS-6694 Debug Data END");
} }
LOG.info("HDFS-6694 Debug Data END");
HAStressTestHarness harness = new HAStressTestHarness(); HAStressTestHarness harness = new HAStressTestHarness();
// Disable permissions so that another user can recover the lease. // Disable permissions so that another user can recover the lease.
harness.conf.setBoolean( harness.conf.setBoolean(