commit 32aaa2a9469071c75dbc0f380a5613f444c2391e
author Todd Lipcon <todd@apache.org> Thu May 19 01:55:59 2011 +0000
committer Todd Lipcon <todd@apache.org> Thu May 19 01:55:59 2011 +0000
tree 4fdf1287f945618a1265d66b2d08d073f8f6892f
parent d800a717100c096a3b9de284284f36f00cf364b2

MAPREDUCE-2515. MapReduce code references some deprecated options. Contributed by Ari Rabkin.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@1124509 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

diff --git a/CHANGES.txt b/CHANGES.txt
index afc051a..085869e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -756,6 +756,9 @@
     MAPREDUCE-2327. MapTask doesn't need to put username information in
     SpillRecord. (todd via tomwhite)
 
+    MAPREDUCE-2515. MapReduce code references some deprecated options
+    (Ari Rabkin via todd)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES

src/java/org/apache/hadoop/mapred/JobTracker.java

diff --git a/src/java/org/apache/hadoop/mapred/JobTracker.java b/src/java/org/apache/hadoop/mapred/JobTracker.java
index c74301a..4ac1c58 100644
--- a/src/java/org/apache/hadoop/mapred/JobTracker.java
+++ b/src/java/org/apache/hadoop/mapred/JobTracker.java
@@ -1655,8 +1655,10 @@
     infoServer.setAttribute("fileSys", historyFS);
 
     this.dnsToSwitchMapping = ReflectionUtils.newInstance(
-        conf.getClass("topology.node.switch.mapping.impl", ScriptBasedMapping.class,
-            DNSToSwitchMapping.class), conf);
+        conf.getClass(
+            CommonConfigurationKeys.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY, 
+            ScriptBasedMapping.class, DNSToSwitchMapping.class),
+         conf);
     this.numTaskCacheLevels = conf.getInt(JT_TASKCACHE_LEVELS, 
         NetworkTopology.DEFAULT_HOST_LEVEL);
 
@@ -4673,8 +4675,8 @@
     
     secretManager = null;
     
-    this.hostsReader = new HostsFileReader(conf.get("mapred.hosts", ""),
-        conf.get("mapred.hosts.exclude", ""));
+    this.hostsReader = new HostsFileReader(conf.get(JTConfig.JT_HOSTS_FILENAME, ""),
+        conf.get(JTConfig.JT_HOSTS_EXCLUDE_FILENAME, ""));
     // queue manager
     Configuration clusterConf = new Configuration(this.conf);
     queueManager = new QueueManager(clusterConf);
@@ -4686,14 +4688,14 @@
 
     // Create the scheduler
     Class<? extends TaskScheduler> schedulerClass
-      = conf.getClass("mapred.jobtracker.taskScheduler",
+      = conf.getClass(JTConfig.JT_TASK_SCHEDULER,
           JobQueueTaskScheduler.class, TaskScheduler.class);
     taskScheduler = 
       (TaskScheduler)ReflectionUtils.newInstance(schedulerClass, conf);
 
     // Create the jetty server
     InetSocketAddress infoSocAddr = NetUtils.createSocketAddr(
-        conf.get("mapred.job.tracker.http.address", "0.0.0.0:50030"));
+        conf.get(JTConfig.JT_HTTP_ADDRESS, "0.0.0.0:50030"));
     String infoBindAddress = infoSocAddr.getHostName();
     int tmpInfoPort = infoSocAddr.getPort();
     this.startTime = clock.getTime();
@@ -4746,8 +4748,10 @@
     recoveryManager = new RecoveryManager();
     
     this.dnsToSwitchMapping = ReflectionUtils.newInstance(
-        conf.getClass("topology.node.switch.mapping.impl", ScriptBasedMapping.class,
-            DNSToSwitchMapping.class), conf);
+        conf.getClass(
+            CommonConfigurationKeys.NET_TOPOLOGY_NODE_SWITCH_MAPPING_IMPL_KEY, 
+            ScriptBasedMapping.class, DNSToSwitchMapping.class), 
+        conf);
     this.numTaskCacheLevels = conf.getInt("mapred.task.cache.levels", 
         NetworkTopology.DEFAULT_HOST_LEVEL);