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 to...@apache.org on 2011/05/20 05:26:01 UTC
svn commit: r1125217 - in /hadoop/hdfs/trunk: CHANGES.txt
src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
Author: todd
Date: Fri May 20 03:26:00 2011
New Revision: 1125217
URL: http://svn.apache.org/viewvc?rev=1125217&view=rev
Log:
HDFS-1952. FSEditLog.open() appears to succeed even if all EDITS directories fail. Contributed by Andrew Wang.
Modified:
hadoop/hdfs/trunk/CHANGES.txt
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1125217&r1=1125216&r2=1125217&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Fri May 20 03:26:00 2011
@@ -1042,6 +1042,9 @@ Release 0.22.0 - Unreleased
HDFS-1575. Viewing block from web UI is broken. (Aaron T. Myers via todd)
+ HDFS-1952. FSEditLog.open() appears to succeed even if all EDITS
+ directories fail. (Andrew Wang via todd)
+
Release 0.21.1 - Unreleased
HDFS-1466. TestFcHdfsSymlink relies on /tmp/test not existing. (eli)
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java?rev=1125217&r1=1125216&r2=1125217&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java Fri May 20 03:26:00 2011
@@ -178,11 +178,18 @@ public class FSEditLog implements NNStor
// Remove the directory from list of storage directories
if(al == null) al = new ArrayList<StorageDirectory>(1);
al.add(sd);
-
}
}
- if(al != null) storage.reportErrorsOnDirectories(al);
+ if (al != null)
+ storage.reportErrorsOnDirectories(al);
+
+ // If there was an error in every storage dir, each one will have
+ // been removed from the list of storage directories.
+ if (storage.getNumStorageDirs(NameNodeDirType.EDITS) == 0) {
+ throw new IOException(
+ "Failed to initialize edits log in any storage directory.");
+ }
}
Modified: hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java?rev=1125217&r1=1125216&r2=1125217&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java (original)
+++ hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java Fri May 20 03:26:00 2011
@@ -24,25 +24,40 @@ import java.util.Iterator;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.ChecksumException;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.*;
+import org.apache.hadoop.hdfs.DFSTestUtil;
import org.apache.hadoop.hdfs.HdfsConfiguration;
import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.hadoop.hdfs.protocol.FSConstants.SafeModeAction;
import org.apache.hadoop.hdfs.server.namenode.EditLogFileInputStream;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants.NamenodeRole;
import org.apache.hadoop.hdfs.server.common.Storage.StorageDirectory;
import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeDirType;
import org.apache.hadoop.hdfs.server.namenode.NNStorage.NameNodeFile;
import org.apache.hadoop.hdfs.server.namenode.metrics.NameNodeMetrics;
+import org.mockito.Mockito;
+
import static org.apache.hadoop.test.MetricsAsserts.*;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.spy;
/**
* This class tests the creation and validation of a checkpoint.
*/
public class TestEditLog extends TestCase {
+ private static final Log LOG = LogFactory.getLog(TestEditLog.class);
+
static final int NUM_DATA_NODES = 0;
// This test creates NUM_THREADS threads and each thread does
@@ -335,4 +350,54 @@ public class TestEditLog extends TestCas
e.getCause().getClass(), ChecksumException.class);
}
}
+
+ public void testFailedOpen() throws Exception {
+ Configuration conf = new HdfsConfiguration();
+ MiniDFSCluster cluster = null;
+ cluster = new MiniDFSCluster.Builder(conf).numDataNodes(NUM_DATA_NODES).build();
+ cluster.waitActive();
+ final FSNamesystem fsn = cluster.getNamesystem();
+
+ // Set up spys
+ final FSImage originalImage = fsn.getFSImage();
+ NNStorage storage = originalImage.getStorage();
+ NNStorage spyStorage = spy(storage);
+ originalImage.storage = spyStorage;
+
+ final FSEditLog editLog = originalImage.getEditLog();
+ FSEditLog spyLog = spy(editLog);
+
+ FSImage spyImage = spy(originalImage);
+ fsn.dir.fsImage = spyImage;
+ spyImage.storage.setStorageDirectories(
+ FSNamesystem.getNamespaceDirs(conf),
+ FSNamesystem.getNamespaceEditsDirs(conf));
+
+ // Fail every attempt to open a new edit file
+ doThrow(new IOException("Injected fault: open")).
+ when(spyLog).addNewEditLogStream((File)anyObject());
+
+ try {
+ spyLog.close();
+ spyLog.open();
+ fail("open did not fail even when all directories failed!");
+ } catch(IOException ioe) {
+ LOG.info("Got expected exception", ioe);
+ } finally {
+ spyLog.close();
+ }
+
+ // Reset and try it with a working open
+ Mockito.reset(spyLog);
+ spyImage.storage.setStorageDirectories(
+ FSNamesystem.getNamespaceDirs(conf),
+ FSNamesystem.getNamespaceEditsDirs(conf));
+ spyLog.open();
+
+ // Close everything off
+ spyLog.close();
+ originalImage.close();
+ fsn.close();
+ }
+
}