You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/06/17 01:07:23 UTC
svn commit: r1136735 - in /hadoop/common/branches/branch-0.20-security-204:
CHANGES.txt src/mapred/org/apache/hadoop/mapred/JobTracker.java
Author: omalley
Date: Thu Jun 16 23:07:23 2011
New Revision: 1136735
URL: http://svn.apache.org/viewvc?rev=1136735&view=rev
Log:
MAPREDUCE-2451. Log the details from health check script at the
JobTracker. (Thomas Graves via cdouglas)
Modified:
hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.20-security-204/src/mapred/org/apache/hadoop/mapred/JobTracker.java
Modified: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt?rev=1136735&r1=1136734&r2=1136735&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-204/CHANGES.txt Thu Jun 16 23:07:23 2011
@@ -17,6 +17,9 @@ Release 0.20.204.0 - unreleased
MAPREDUCE-2555. Avoid sprious logging from completedtasks. (Thomas Graves
via cdouglas)
+ MAPREDUCE-2451. Log the details from health check script at the
+ JobTracker. (Thomas Graves via cdouglas)
+
MAPREDUCE-2535. Fix NPE in JobClient caused by retirement. (Robert Joseph
Evans via cdouglas)
Propchange: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 16 23:07:23 2011
@@ -1,5 +1,5 @@
/hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,1044225
-/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1097202,1098837,1100336,1101629,1101729,1102378,1102869,1103940,1125139,1125170,1125587,1125589,1127362,1131277,1131286,1131290,1131299,1131737,1134140
+/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1097202,1098837,1100336,1101315,1101629,1101729,1102378,1102869,1103940,1125139,1125170,1125587,1125589,1127362,1131277,1131286,1131290,1131299,1131737,1134140
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097012-1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1132788,1133133,1133274,1133282
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
Modified: hadoop/common/branches/branch-0.20-security-204/src/mapred/org/apache/hadoop/mapred/JobTracker.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/mapred/org/apache/hadoop/mapred/JobTracker.java?rev=1136735&r1=1136734&r2=1136735&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/src/mapred/org/apache/hadoop/mapred/JobTracker.java (original)
+++ hadoop/common/branches/branch-0.20-security-204/src/mapred/org/apache/hadoop/mapred/JobTracker.java Thu Jun 16 23:07:23 2011
@@ -922,16 +922,18 @@ public class JobTracker implements MRCon
if (LOG.isDebugEnabled()) {
LOG.debug("Adding/overwriting reason for " + shade +
"listed tracker : " + hostName + " Reason for " + shade +
- "listing is : " + rfb);
+ "listing is : " + rfb + " Reason details : " + reason);
}
if (!fi.getReasonForBlacklisting(gray).contains(rfb)) {
LOG.info("Adding new reason for " + shade + "listed tracker : " +
- hostName + " Reason for " + shade + "listing is : " + rfb);
+ hostName + " Reason for " + shade + "listing is : " + rfb
+ + " Reason details : " + reason);
}
fi.addBlacklistedReason(rfb, reason, gray);
} else {
LOG.info("Adding new " + shade + "listed tracker : " + hostName
- + " Reason for " + shade + "listing is : " + rfb);
+ + " Reason for " + shade + "listing is : " + rfb
+ + " Reason details : " + reason);
if (gray) {
incrGraylistedTrackers(getNumTaskTrackersOnHost(hostName));
} else {