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 00:01:52 UTC
svn commit: r1136701 - in /hadoop/common/branches/branch-0.20-security-204:
CHANGES.txt src/mapred/org/apache/hadoop/mapred/JobInProgress.java
src/mapred/org/apache/hadoop/mapred/JobTracker.java
src/test/org/apache/hadoop/mapred/TestJobHistoryConfig.java
Author: omalley
Date: Thu Jun 16 22:01:51 2011
New Revision: 1136701
URL: http://svn.apache.org/viewvc?rev=1136701&view=rev
Log:
MAPREDUCE-2558. Add queue-level metrics 0.20-security branch - test fix
(jeffrey nasbit via mahadev)
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/JobInProgress.java
hadoop/common/branches/branch-0.20-security-204/src/mapred/org/apache/hadoop/mapred/JobTracker.java
hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/mapred/TestJobHistoryConfig.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=1136701&r1=1136700&r2=1136701&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 22:01:51 2011
@@ -11,6 +11,9 @@ Release 0.20.204.0 - unreleased
BUG FIXES
+ MAPREDUCE-2558. Add queue-level metrics 0.20-security branch - test fix
+ (jeffrey nasbit via mahadev)
+
HADOOP-7364. TestMiniMRDFSCaching fails if test.build.dir is set to
something other than build/test. (Thomas Graves via mahadev)
Propchange: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 16 22:01:51 2011
@@ -1,7 +1,7 @@
/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,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:1133282
+/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1133274,1133282
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified: hadoop/common/branches/branch-0.20-security-204/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/mapred/org/apache/hadoop/mapred/JobInProgress.java?rev=1136701&r1=1136700&r2=1136701&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/src/mapred/org/apache/hadoop/mapred/JobInProgress.java (original)
+++ hadoop/common/branches/branch-0.20-security-204/src/mapred/org/apache/hadoop/mapred/JobInProgress.java Thu Jun 16 22:01:51 2011
@@ -347,6 +347,12 @@ public class JobInProgress {
this.mapFailuresPercent = conf.getMaxMapTaskFailuresPercent();
this.reduceFailuresPercent = conf.getMaxReduceTaskFailuresPercent();
+ Queue queue = this.jobtracker.getQueueManager().getQueue(queueName);
+ if (queue == null) {
+ throw new IOException("Queue \"" + queueName + "\" does not exist");
+ }
+ this.queueMetrics = queue.getMetrics();
+
// Check task limits
checkTaskLimits();
@@ -422,6 +428,13 @@ public class JobInProgress {
jobFile, url, conf.getJobName(),
conf.getQueueName());
+ Queue queue = this.jobtracker.getQueueManager().getQueue(queueName);
+ if (queue == null) {
+ throw new IOException("Queue \"" + queueName + "\" does not exist");
+ }
+ this.queueMetrics = queue.getMetrics();
+ this.queueMetrics.addPrepJob(conf, jobId);
+
this.submitHostName = conf.getJobSubmitHostName();
this.submitHostAddress = conf.getJobSubmitHostAddress();
this.numMapTasks = conf.getNumMapTasks();
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=1136701&r1=1136700&r2=1136701&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 22:01:51 2011
@@ -3926,13 +3926,8 @@ public class JobTracker implements MRCon
}
synchronized (this) {
- String queue = job.getProfile().getQueueName();
- if (!(queueManager.getQueues().contains(queue))) {
- job.fail();
- throw new IOException("Queue \"" + queue + "\" does not exist");
- }
-
// check if queue is RUNNING
+ String queue = job.getProfile().getQueueName();
if (!queueManager.isRunning(queue)) {
throw new IOException("Queue \"" + queue + "\" is not running");
}
Modified: hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/mapred/TestJobHistoryConfig.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/mapred/TestJobHistoryConfig.java?rev=1136701&r1=1136700&r2=1136701&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/mapred/TestJobHistoryConfig.java (original)
+++ hadoop/common/branches/branch-0.20-security-204/src/test/org/apache/hadoop/mapred/TestJobHistoryConfig.java Thu Jun 16 22:01:51 2011
@@ -110,7 +110,7 @@ public class TestJobHistoryConfig extend
conf.setSpeculativeExecution(false);
conf.setJobName("test");
conf.setUser("testuser");
- conf.setQueueName("testQueue");
+ conf.setQueueName("default");
String TEST_ROOT_DIR = new Path(System.getProperty("test.build.data",
"/tmp")).toString().replace(' ', '+');
JobTracker jt = JobTracker.startTracker(conf);