Author: eli
Date: Tue Nov 16 20:41:15 2010
New Revision: 1035795
URL: http://svn.apache.org/viewvc?rev=1035795&view=rev
Log:
HDFS-455. Make NN and DN handle in a intuitive way comma-separated configuration strings.
Contributed by Michele Catasta
Modified:
hadoop/hdfs/trunk/CHANGES.txt
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1035795&r1=1035794&r2=1035795&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Tue Nov 16 20:41:15 2010
@@ -197,6 +197,9 @@ Trunk (unreleased changes)
HDFS-1387. Update HDFS permissions guide for security. (Todd Lipcon via eli)
+ HDFS-455. Make NN and DN handle in a intuitive way comma-separated
+ configuration strings. (Michele Catasta via eli)
+
OPTIMIZATIONS
HDFS-1140. Speedup INode.getPathComponents. (Dmytro Molkov via shv)
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java?rev=1035795&r1=1035794&r2=1035795&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java Tue Nov
16 20:41:15 2010
@@ -1501,7 +1501,7 @@ public class DataNode extends Configured
static Collection<URI> getStorageDirs(Configuration conf) {
Collection<String> dirNames =
- conf.getStringCollection(DFSConfigKeys.DFS_DATANODE_DATA_DIR_KEY);
+ conf.getTrimmedStringCollection(DFSConfigKeys.DFS_DATANODE_DATA_DIR_KEY);
return Util.stringCollectionAsURIs(dirNames);
}
Modified: hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1035795&r1=1035794&r2=1035795&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original)
+++ hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Tue
Nov 16 20:41:15 2010
@@ -367,7 +367,7 @@ public class FSNamesystem implements FSC
public static Collection<URI> getStorageDirs(Configuration conf,
String propertyName) {
- Collection<String> dirNames = conf.getStringCollection(propertyName);
+ Collection<String> dirNames = conf.getTrimmedStringCollection(propertyName);
StartupOption startOpt = NameNode.getStartupOption(conf);
if(startOpt == StartupOption.IMPORT) {
// In case of IMPORT this will get rid of default directories
@@ -378,7 +378,7 @@ public class FSNamesystem implements FSC
cE.addResource("core-default.xml");
cE.addResource("core-site.xml");
cE.addResource("hdfs-default.xml");
- Collection<String> dirNames2 = cE.getStringCollection(propertyName);
+ Collection<String> dirNames2 = cE.getTrimmedStringCollection(propertyName);
dirNames.removeAll(dirNames2);
if(dirNames.isEmpty())
LOG.warn("!!! WARNING !!!" +
|