Author: jghoman
Date: Sat Apr 24 21:30:55 2010
New Revision: 937705
URL: http://svn.apache.org/viewvc?rev=937705&view=rev
Log:
HDFS-1101. TestDiskError.testLocalDirs() fails. (cdouglas via jghoman)
Modified:
hadoop/hdfs/trunk/CHANGES.txt
hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java
Modified: hadoop/hdfs/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=937705&r1=937704&r2=937705&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Sat Apr 24 21:30:55 2010
@@ -284,6 +284,8 @@ Trunk (unreleased changes)
HDFS-833. Datanode shutdown should log problems with Storage.unlockAll()
(Steve Loughran via dhruba)
+ HDFS-1101. TestDiskError.testLocalDirs() fails. (cdouglas via jghoman)
+
Release 0.21.0 - Unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java?rev=937705&r1=937704&r2=937705&view=diff
==============================================================================
---
hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java
(original)
+++
hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java
Sat Apr 24 21:30:55 2010
@@ -166,13 +166,16 @@ public class TestDiskError extends TestC
// Check permissions on directories in 'dfs.data.dir'
FileSystem localFS = FileSystem.getLocal(conf);
- String[] dataDirs =
conf.getStrings(DFSConfigKeys.DFS_DATANODE_DATA_DIR_KEY);
- for (String dir : dataDirs) {
- Path dataDir = new Path(dir);
- FsPermission actual = localFS.getFileStatus(dataDir).getPermission();
- assertEquals("Permission for dir: " + dataDir + ", is " + actual +
- ", while expected is " + expected,
- expected, actual);
+ for (DataNode dn : cluster.getDataNodes()) {
+ String[] dataDirs =
+ dn.getConf().getStrings(DFSConfigKeys.DFS_DATANODE_DATA_DIR_KEY);
+ for (String dir : dataDirs) {
+ Path dataDir = new Path(dir);
+ FsPermission actual = localFS.getFileStatus(dataDir).getPermission();
+ assertEquals("Permission for dir: " + dataDir + ", is " + actual +
+ ", while expected is " + expected,
+ expected, actual);
+ }
}
} finally {
if (cluster != null)
