Author: atm
Date: Wed May 16 16:27:55 2012
New Revision: 1339252
URL: http://svn.apache.org/viewvc?rev=1339252&view=rev
Log:
HDFS-3413. TestFailureToReadEdits timing out. Contributed by Aaron T. Myers.
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/server/namenode/ha/TestFailureToReadEdits.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=1339252&r1=1339251&r2=1339252&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
Wed May 16 16:27:55 2012
@@ -58,6 +58,8 @@ Release 2.0.1-alpha - UNRELEASED
HDFS-2759. Pre-allocate HDFS edit log files after writing version number.
(atm)
+ HDFS-3413. TestFailureToReadEdits timing out. (atm)
+
Release 2.0.0-alpha - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestFailureToReadEdits.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestFailureToReadEdits.java?rev=1339252&r1=1339251&r2=1339252&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestFailureToReadEdits.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestFailureToReadEdits.java
Wed May 16 16:27:55 2012
@@ -256,16 +256,21 @@ public class TestFailureToReadEdits {
// Shutdown the active NN.
cluster.shutdownNameNode(0);
+ Runtime mockRuntime = mock(Runtime.class);
+ cluster.getNameNode(1).setRuntimeForTesting(mockRuntime);
+ verify(mockRuntime, times(0)).exit(anyInt());
try {
// Transition the standby to active.
cluster.transitionToActive(1);
fail("Standby transitioned to active, but should not have been able to");
} catch (ServiceFailedException sfe) {
- LOG.info("got expected exception: " + sfe.toString(), sfe);
+ Throwable sfeCause = sfe.getCause();
+ LOG.info("got expected exception: " + sfeCause.toString(), sfeCause);
assertTrue("Standby failed to catch up for some reason other than "
- + "failure to read logs", sfe.toString().contains(
+ + "failure to read logs", sfeCause.getCause().toString().contains(
EditLogInputException.class.getName()));
}
+ verify(mockRuntime, times(1)).exit(anyInt());
}
private LimitedEditLogAnswer causeFailureOnEditLogRead() throws IOException {
