Browse Source

MAPREDUCE-4318. TestRecoveryManager should not use raw configuration keys. Contributed by Benoy Antony.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1347853 13f79535-47bb-0310-9956-ffa450edef68
Konstantin Shvachko 13 years ago
parent
commit
972edc40c4

+ 3 - 0
mapreduce/CHANGES.txt

@@ -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

+ 4 - 4
mapreduce/src/test/mapred/org/apache/hadoop/mapred/TestRecoveryManager.java

@@ -73,12 +73,11 @@ public class TestRecoveryManager extends TestCase {
     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 TestCase {
     
     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(