Sfoglia il codice sorgente

HADOOP-3516. Merge -r 665887:665888 from trunk to branch 0.18.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.18@665889 13f79535-47bb-0310-9956-ffa450edef68
Owen O'Malley 17 anni fa
parent
commit
43038761b0
2 ha cambiato i file con 4 aggiunte e 1 eliminazioni
  1. 3 0
      CHANGES.txt
  2. 1 1
      src/tools/org/apache/hadoop/tools/HadoopArchives.java

+ 3 - 0
CHANGES.txt

@@ -542,6 +542,9 @@ Release 0.18.0 - Unreleased
     HADOOP-3511. Fixes namenode image to not set the root's quota to an
     HADOOP-3511. Fixes namenode image to not set the root's quota to an
     invalid value when the quota was not saved in the image. (hairong)
     invalid value when the quota was not saved in the image. (hairong)
 
 
+    HADOOP-3516. Ensure the JobClient in HadoopArchives is initialized
+    with a configuration. (Subramaniam Krishnan via omalley)
+
 Release 0.17.0 - 2008-05-18
 Release 0.17.0 - 2008-05-18
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 1 - 1
src/tools/org/apache/hadoop/tools/HadoopArchives.java

@@ -312,7 +312,7 @@ public class HadoopArchives implements Tool {
     FileOutputFormat.setOutputPath(conf, outputPath);
     FileOutputFormat.setOutputPath(conf, outputPath);
     conf.set(DST_DIR_LABEL, outputPath.toString());
     conf.set(DST_DIR_LABEL, outputPath.toString());
     final String randomId = DistCp.getRandomId();
     final String randomId = DistCp.getRandomId();
-    Path jobDirectory = new Path(new JobClient().getSystemDir(),
+    Path jobDirectory = new Path(new JobClient(conf).getSystemDir(),
                           NAME + "_" + randomId);
                           NAME + "_" + randomId);
     conf.set(JOB_DIR_LABEL, jobDirectory.toString());
     conf.set(JOB_DIR_LABEL, jobDirectory.toString());
     //get a tmp directory for input splits
     //get a tmp directory for input splits