You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by to...@apache.org on 2011/05/19 03:55:59 UTC
svn commit: r1124509 - in /hadoop/mapreduce/trunk: CHANGES.txt
src/java/org/apache/hadoop/mapred/JobTracker.java
Author: todd
Date: Thu May 19 01:55:59 2011
New Revision: 1124509
URL: http://svn.apache.org/viewvc?rev=1124509&view=rev
Log:
MAPREDUCE-2515. MapReduce code references some deprecated options. Contributed by Ari Rabkin.
Modified:
hadoop/mapreduce/trunk/CHANGES.txt
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java
Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1124509&r1=1124508&r2=1124509&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Thu May 19 01:55:59 2011
@@ -756,6 +756,9 @@ Release 0.22.0 - Unreleased
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
Modified: hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java?rev=1124509&r1=1124508&r2=1124509&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java (original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapred/JobTracker.java Thu May 19 01:55:59 2011
@@ -1655,8 +1655,10 @@ public class JobTracker implements MRCon
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 @@ public class JobTracker implements MRCon
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 @@ public class JobTracker implements MRCon
// 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 @@ public class JobTracker implements MRCon
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);