Przeglądaj źródła

HADOOP-823. Fix problem starting datanode when not all configured data directories exist. Contributed by Bryan Pendleton.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@488417 13f79535-47bb-0310-9956-ffa450edef68
Doug Cutting 18 lat temu
rodzic
commit
2880d29e90
2 zmienionych plików z 5 dodań i 2 usunięć
  1. 3 0
      CHANGES.txt
  2. 2 2
      src/java/org/apache/hadoop/dfs/DataNode.java

+ 3 - 0
CHANGES.txt

@@ -119,6 +119,9 @@ Trunk (unreleased changes)
     namenode-internal use, and one for namespace persistence.
     (Dhruba Borthakur via cutting) 
 
+34. HADOOP-823.  Fix problem starting datanode when not all configured
+    data directories exist.  (Bryan Pendleton via cutting)
+
 
 Release 0.9.2 - 2006-12-15
 

+ 2 - 2
src/java/org/apache/hadoop/dfs/DataNode.java

@@ -1101,7 +1101,7 @@ public class DataNode implements FSConstants, Runnable {
    */
   static DataNode makeInstance(String[] dataDirs, Configuration conf)
   throws IOException {
-    ArrayList dirs = new ArrayList();
+    ArrayList<String> dirs = new ArrayList<String>();
     for (int i = 0; i < dataDirs.length; i++) {
       File data = new File(dataDirs[i]);
       try {
@@ -1111,7 +1111,7 @@ public class DataNode implements FSConstants, Runnable {
         LOG.warn("Invalid directory in dfs.data.dir: " + e.getMessage() );
       }
     }
-    return ((dirs.size() > 0) ? new DataNode(conf, dataDirs) : null);
+    return ((dirs.size() > 0) ? new DataNode(conf, dirs.toArray(new String[dirs.size()])) : null);
   }
 
   public String toString() {