Author: jlowe Date: Tue Jun 18 22:04:41 2013 New Revision: 1494336 URL: http://svn.apache.org/r1494336 Log: svn merge -c 1494331 FIXES: HADOOP-9582. Non-existent file to "hadoop fs -conf" doesn't throw error. Contributed by Ashwin Shankar
Added: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShell.java - copied unchanged from r1494331, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFsShell.java Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1494336&r1=1494335&r2=1494336&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jun 18 22:04:41 2013 @@ -12,6 +12,9 @@ Release 2.3.0 - UNRELEASED BUG FIXES + HADOOP-9582. Non-existent file to "hadoop fs -conf" doesn't throw error + (Ashwin Shankar via jlowe) + Release 2.2.0 - UNRELEASED INCOMPATIBLE CHANGES @@ -1504,6 +1507,12 @@ Release 0.23.9 - UNRELEASED BUG FIXES + HADOOP-9581. hadoop --config non-existent directory should result in error + (Ashwin Shankar via jlowe) + + HADOOP-9582. Non-existent file to "hadoop fs -conf" doesn't throw error + (Ashwin Shankar via jlowe) + Release 0.23.8 - 2013-06-05 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java?rev=1494336&r1=1494335&r2=1494336&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java Tue Jun 18 22:04:41 2013 @@ -1874,7 +1874,7 @@ public class Configuration implements It private Document parse(DocumentBuilder builder, URL url) throws IOException, SAXException { if (!quietmode) { - LOG.info("parsing URL " + url); + LOG.debug("parsing URL " + url); } if (url == null) { return null; @@ -1885,7 +1885,7 @@ public class Configuration implements It private Document parse(DocumentBuilder builder, InputStream is, String systemId) throws IOException, SAXException { if (!quietmode) { - LOG.info("parsing input stream " + is); + LOG.debug("parsing input stream " + is); } if (is == null) { return null; @@ -1958,7 +1958,7 @@ public class Configuration implements It .getAbsoluteFile(); if (file.exists()) { if (!quiet) { - LOG.info("parsing File " + file); + LOG.debug("parsing File " + file); } doc = parse(builder, new BufferedInputStream( new FileInputStream(file)), ((Path)resource).toString()); Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java?rev=1494336&r1=1494335&r2=1494336&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java Tue Jun 18 22:04:41 2013 @@ -300,6 +300,9 @@ public class FsShell extends Configured */ public static void main(String argv[]) throws Exception { FsShell shell = newShellInstance(); + Configuration conf = new Configuration(); + conf.setQuietMode(false); + shell.setConf(conf); int res; try { res = ToolRunner.run(shell, argv);