Author: shv
Date: Fri Jun 8 01:17:06 2012
New Revision: 1347853
URL: http://svn.apache.org/viewvc?rev=1347853&view=rev
Log:
MAPREDUCE-4318. TestRecoveryManager should not use raw configuration keys.
Contributed by Benoy Antony.
Modified:
hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt
hadoop/common/branches/branch-0.22/mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestRecoveryManager.java
Modified: hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt?rev=1347853&r1=1347852&r2=1347853&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt Fri Jun 8
01:17:06 2012
@@ -75,6 +75,9 @@ Release 0.22.1 - Unreleased
MAPREDUCE-4249. Fix streaming test TestFileArgs. (Benoy Antony via shv)
+ MAPREDUCE-4318. TestRecoveryManager should not use raw configuration keys.
+ (Benoy Antony via shv)
+
Release 0.22.0 - 2011-11-29
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-0.22/mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestRecoveryManager.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestRecoveryManager.java?rev=1347853&r1=1347852&r2=1347853&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.22/mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestRecoveryManager.java
(original)
+++
hadoop/common/branches/branch-0.22/mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestRecoveryManager.java
Fri Jun 8 01:17:06 2012
@@ -73,12 +73,11 @@ public class TestRecoveryManager extends
FileSystem fs = FileSystem.get(new Configuration());
fs.delete(TEST_DIR, true); // cleanup
- conf.set("mapred.jobtracker.job.history.block.size", "1024");
- conf.set("mapred.jobtracker.job.history.buffer.size", "1024");
+ conf.set(JTConfig.JT_JOBHISTORY_BLOCK_SIZE, "1024");
MiniMRCluster mr = new MiniMRCluster(1, "file:///", 1, null, null, conf);
- JobConf job1 = mr.createJobConf();
+ JobConf job1 = mr.createJobConf();
UtilsForTests.configureWaitingJobConf(job1,
new Path(TEST_DIR, "input"), new Path(TEST_DIR, "output1"), 2, 0,
@@ -249,7 +248,8 @@ public class TestRecoveryManager extends
mr.getJobTrackerConf().setBoolean(MRConfig.MR_ACLS_ENABLED, true);
- mr.getJobTrackerConf().set("mapred.queue.names", "default");
+
mr.getJobTrackerConf().set(DeprecatedQueueConfigurationParser.MAPRED_QUEUE_NAMES_KEY,
+ "default");
UserGroupInformation ugi = UserGroupInformation.getLoginUser();
mr.getJobTrackerConf().set(toFullPropertyName(
