Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-7863: apply HADOOP-7424 to 0.23.1 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1207611 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steve Loughran 2011-11-28 21:07:18 +00:00
parent 895094ad15
commit 22df4636f5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -18,6 +18,9 @@ Release 0.23.1 - Unreleased
HADOOP-7858. Drop some info logging to DEBUG level in IPC, HADOOP-7858. Drop some info logging to DEBUG level in IPC,
metrics, and HTTP. (todd via eli) metrics, and HTTP. (todd via eli)
HADOOP-7424. Log an error if the topology script doesn't handle multiple args.
(Uma Maheswara Rao G via eli)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/ScriptBasedMapping.java
View File

@ -23,11 +23,11 @@ import java.io.*;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.util.*;
import org.apache.hadoop.util.Shell.ShellCommandExecutor; import org.apache.hadoop.util.Shell.ShellCommandExecutor;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.*; import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.fs.CommonConfigurationKeys;
/** /**
@ -145,7 +145,7 @@ implements Configurable
if (m.size() != names.size()) { if (m.size() != names.size()) {
// invalid number of entries returned by the script // invalid number of entries returned by the script
LOG.warn("Script " + scriptName + " returned " LOG.error("Script " + scriptName + " returned "
+ Integer.toString(m.size()) + " values when " + Integer.toString(m.size()) + " values when "
+ Integer.toString(names.size()) + " were expected."); + Integer.toString(names.size()) + " were expected.");
return null; return null;