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

svn merge -c 1426018 FIXES: MAPREDUCE-4902. Fix typo "receievd" should be "received" in log output. Contributed by Albert Chu 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426020 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason Darrell Lowe 2012-12-26 20:49:39 +00:00
parent 6796f8d226
commit 7bec80179b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -491,6 +491,9 @@ Release 0.23.6 - UNRELEASED
MAPREDUCE-4890. Invalid TaskImpl state transitions when task fails while MAPREDUCE-4890. Invalid TaskImpl state transitions when task fails while
speculating (jlowe) speculating (jlowe)
MAPREDUCE-4902. Fix typo "receievd" should be "received" in log output
(Albert Chu via jlowe)
Release 0.23.5 - UNRELEASED Release 0.23.5 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/Fetcher.java
View File

@ -282,7 +282,7 @@ class Fetcher<K,V> extends Thread {
LOG.debug("url="+msgToEncode+";encHash="+encHash+";replyHash="+replyHash); LOG.debug("url="+msgToEncode+";encHash="+encHash+";replyHash="+replyHash);
// verify that replyHash is HMac of encHash // verify that replyHash is HMac of encHash
SecureShuffleUtils.verifyReply(replyHash, encHash, jobTokenSecret); SecureShuffleUtils.verifyReply(replyHash, encHash, jobTokenSecret);
LOG.info("for url="+msgToEncode+" sent hash and receievd reply"); LOG.info("for url="+msgToEncode+" sent hash and received reply");
} catch (IOException ie) { } catch (IOException ie) {
boolean connectExcpt = ie instanceof ConnectException; boolean connectExcpt = ie instanceof ConnectException;
ioErrs.increment(1); ioErrs.increment(1);