Skip to content

Commit 3ea4f41

Browse files
aajisakaaajisaka
committed
MAPREDUCE-6794. Remove unused properties from TTConfig.java
1 parent cb9bc6e commit 3ea4f41

File tree

5 files changed

+2
-171
lines changed

5 files changed

+2
-171
lines changed

‎hadoop-common-project/hadoop-common/src/site/markdown/DeprecatedProperties.md‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ The following table lists the configuration property names that are deprecated i
6565
| fs.s3a.server-side-encryption-key | fs.s3a.server-side-encryption.key |
6666
| hadoop.configured.node.mapping | net.topology.configured.node.mapping |
6767
| hadoop.native.lib | io.native.lib.available |
68-
| hadoop.net.static.resolutions | mapreduce.tasktracker.net.static.resolutions |
6968
| hadoop.pipes.command-file.keep | mapreduce.pipes.commandfile.preserve |
7069
| hadoop.pipes.executable.interpretor | mapreduce.pipes.executable.interpretor |
7170
| hadoop.pipes.executable | mapreduce.pipes.executable |
@@ -89,7 +88,6 @@ The following table lists the configuration property names that are deprecated i
8988
| keep.failed.task.files | mapreduce.task.files.preserve.failedtasks |
9089
| keep.task.files.pattern | mapreduce.task.files.preserve.filepattern |
9190
| key.value.separator.in.input.line | mapreduce.input.keyvaluelinerecordreader.key.value.separator |
92-
| local.cache.size | mapreduce.tasktracker.cache.local.size |
9391
| map.input.file | mapreduce.map.input.file |
9492
| map.input.length | mapreduce.map.input.length |
9593
| map.input.start | mapreduce.map.input.start |
@@ -113,10 +111,6 @@ The following table lists the configuration property names that are deprecated i
113111
| mapred.compress.map.output | mapreduce.map.output.compress |
114112
| mapred.data.field.separator | mapreduce.fieldsel.data.field.separator |
115113
| mapred.debug.out.lines | mapreduce.task.debugout.lines |
116-
| mapred.healthChecker.interval | mapreduce.tasktracker.healthchecker.interval |
117-
| mapred.healthChecker.script.args | mapreduce.tasktracker.healthchecker.script.args |
118-
| mapred.healthChecker.script.path | mapreduce.tasktracker.healthchecker.script.path |
119-
| mapred.healthChecker.script.timeout | mapreduce.tasktracker.healthchecker.script.timeout |
120114
| mapred.inmem.merge.threshold | mapreduce.reduce.merge.inmem.threshold |
121115
| mapred.input.dir.formats | mapreduce.input.multipleinputs.dir.formats |
122116
| mapred.input.dir.mappers | mapreduce.input.multipleinputs.dir.mappers |
@@ -146,8 +140,6 @@ The following table lists the configuration property names that are deprecated i
146140
| mapred.line.input.format.linespermap | mapreduce.input.lineinputformat.linespermap |
147141
| mapred.linerecordreader.maxlength | mapreduce.input.linerecordreader.line.maxlength |
148142
| mapred.local.dir | mapreduce.cluster.local.dir |
149-
| mapred.local.dir.minspacekill | mapreduce.tasktracker.local.dir.minspacekill |
150-
| mapred.local.dir.minspacestart | mapreduce.tasktracker.local.dir.minspacestart |
151143
| mapred.map.child.env | mapreduce.map.env |
152144
| mapred.map.child.java.opts | mapreduce.map.java.opts |
153145
| mapred.map.child.log.level | mapreduce.map.log.level |
@@ -212,19 +204,10 @@ The following table lists the configuration property names that are deprecated i
212204
| mapred.task.profile.params | mapreduce.task.profile.params |
213205
| mapred.task.profile.reduces | mapreduce.task.profile.reduces |
214206
| mapred.task.timeout | mapreduce.task.timeout |
215-
| mapred.tasktracker.dns.interface | mapreduce.tasktracker.dns.interface |
216-
| mapred.tasktracker.dns.nameserver | mapreduce.tasktracker.dns.nameserver |
217-
| mapred.tasktracker.events.batchsize | mapreduce.tasktracker.events.batchsize |
218-
| mapred.task.tracker.http.address | mapreduce.tasktracker.http.address |
219207
| mapred.tasktracker.indexcache.mb | mapreduce.tasktracker.indexcache.mb |
220-
| mapred.tasktracker.instrumentation | mapreduce.tasktracker.instrumentation |
221208
| mapred.tasktracker.map.tasks.maximum | mapreduce.tasktracker.map.tasks.maximum |
222209
| mapred.tasktracker.memory\_calculator\_plugin | mapreduce.tasktracker.resourcecalculatorplugin |
223210
| mapred.tasktracker.memorycalculatorplugin | mapreduce.tasktracker.resourcecalculatorplugin |
224-
| mapred.tasktracker.reduce.tasks.maximum | mapreduce.tasktracker.reduce.tasks.maximum |
225-
| mapred.task.tracker.report.address | mapreduce.tasktracker.report.address |
226-
| mapred.task.tracker.task-controller | mapreduce.tasktracker.taskcontroller |
227-
| mapred.tasktracker.tasks.sleeptime-before-sigkill | mapreduce.tasktracker.tasks.sleeptimebeforesigkill |
228211
| mapred.temp.dir | mapreduce.cluster.temp.dir |
229212
| mapred.text.key.comparator.options | mapreduce.partition.keycomparator.options |
230213
| mapred.text.key.partitioner.options | mapreduce.partition.keypartitioner.options |
@@ -251,9 +234,6 @@ The following table lists the configuration property names that are deprecated i
251234
| sequencefile.filter.regex | mapreduce.input.sequencefileinputfilter.regex |
252235
| session.id | dfs.metrics.session-id |
253236
| slave.host.name | dfs.datanode.hostname |
254-
| slave.host.name | mapreduce.tasktracker.host.name |
255-
| tasktracker.contention.tracking | mapreduce.tasktracker.contention.tracking |
256-
| tasktracker.http.threads | mapreduce.tasktracker.http.threads |
257237
| topology.node.switch.mapping.impl | net.topology.node.switch.mapping.impl |
258238
| topology.script.file.name | net.topology.script.file.name |
259239
| topology.script.number.args | net.topology.script.number.args |

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/server/tasktracker/TTConfig.java‎

Lines changed: 2 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -22,86 +22,17 @@
2222
import org.apache.hadoop.mapreduce.MRConfig;
2323

2424
/**
25-
* Place holder for TaskTracker server-level configuration.
26-
*
27-
* The keys should have "mapreduce.tasktracker." as the prefix
25+
* Place holder for MapReduce server-level configuration.
26+
* (formerly TaskTracker configuration)
2827
*/
2928
@InterfaceAudience.Private
3029
@InterfaceStability.Evolving
3130
public interface TTConfig extends MRConfig {
3231

33-
// Task-tracker configuration properties
34-
public static final String TT_HEALTH_CHECKER_INTERVAL =
35-
"mapreduce.tasktracker.healthchecker.interval";
36-
public static final String TT_HEALTH_CHECKER_SCRIPT_ARGS =
37-
"mapreduce.tasktracker.healthchecker.script.args";
38-
public static final String TT_HEALTH_CHECKER_SCRIPT_PATH =
39-
"mapreduce.tasktracker.healthchecker.script.path";
40-
public static final String TT_HEALTH_CHECKER_SCRIPT_TIMEOUT =
41-
"mapreduce.tasktracker.healthchecker.script.timeout";
42-
public static final String TT_LOCAL_DIR_MINSPACE_KILL =
43-
"mapreduce.tasktracker.local.dir.minspacekill";
44-
public static final String TT_LOCAL_DIR_MINSPACE_START =
45-
"mapreduce.tasktracker.local.dir.minspacestart";
46-
public static final String TT_HTTP_ADDRESS =
47-
"mapreduce.tasktracker.http.address";
48-
public static final String TT_REPORT_ADDRESS =
49-
"mapreduce.tasktracker.report.address";
50-
public static final String TT_TASK_CONTROLLER =
51-
"mapreduce.tasktracker.taskcontroller";
52-
public static final String TT_CONTENTION_TRACKING =
53-
"mapreduce.tasktracker.contention.tracking";
54-
public static final String TT_STATIC_RESOLUTIONS =
55-
"mapreduce.tasktracker.net.static.resolutions";
56-
public static final String TT_HTTP_THREADS =
57-
"mapreduce.tasktracker.http.threads";
58-
public static final String TT_HOST_NAME = "mapreduce.tasktracker.host.name";
59-
public static final String TT_SLEEP_TIME_BEFORE_SIG_KILL =
60-
"mapreduce.tasktracker.tasks.sleeptimebeforesigkill";
61-
public static final String TT_DNS_INTERFACE =
62-
"mapreduce.tasktracker.dns.interface";
63-
public static final String TT_DNS_NAMESERVER =
64-
"mapreduce.tasktracker.dns.nameserver";
65-
public static final String TT_MAX_TASK_COMPLETION_EVENTS_TO_POLL =
66-
"mapreduce.tasktracker.events.batchsize";
6732
public static final String TT_INDEX_CACHE =
6833
"mapreduce.tasktracker.indexcache.mb";
69-
public static final String TT_INSTRUMENTATION =
70-
"mapreduce.tasktracker.instrumentation";
7134
public static final String TT_MAP_SLOTS =
7235
"mapreduce.tasktracker.map.tasks.maximum";
73-
/**
74-
* @deprecated Use {@link #TT_RESOURCE_CALCULATOR_PLUGIN} instead
75-
*/
76-
@Deprecated
77-
public static final String TT_MEMORY_CALCULATOR_PLUGIN =
78-
"mapreduce.tasktracker.memorycalculatorplugin";
7936
public static final String TT_RESOURCE_CALCULATOR_PLUGIN =
8037
"mapreduce.tasktracker.resourcecalculatorplugin";
81-
public static final String TT_REDUCE_SLOTS =
82-
"mapreduce.tasktracker.reduce.tasks.maximum";
83-
public static final String TT_LOCAL_CACHE_SIZE =
84-
"mapreduce.tasktracker.cache.local.size";
85-
public static final String TT_LOCAL_CACHE_SUBDIRS_LIMIT =
86-
"mapreduce.tasktracker.cache.local.numberdirectories";
87-
public static final String TT_OUTOFBAND_HEARBEAT =
88-
"mapreduce.tasktracker.outofband.heartbeat";
89-
public static final String TT_RESERVED_PHYSCIALMEMORY_MB =
90-
"mapreduce.tasktracker.reserved.physicalmemory.mb";
91-
public static final String TT_USER_NAME = "mapreduce.tasktracker.kerberos.principal";
92-
public static final String TT_KEYTAB_FILE =
93-
"mapreduce.tasktracker.keytab.file";
94-
public static final String TT_GROUP =
95-
"mapreduce.tasktracker.group";
96-
public static final String TT_USERLOGCLEANUP_SLEEPTIME =
97-
"mapreduce.tasktracker.userlogcleanup.sleeptime";
98-
public static final String TT_DISTRIBUTED_CACHE_CHECK_PERIOD =
99-
"mapreduce.tasktracker.distributedcache.checkperiod";
100-
/**
101-
* Percentage of the local distributed cache that should be kept in between
102-
* garbage collection.
103-
*/
104-
public static final String TT_LOCAL_CACHE_KEEP_AROUND_PCT =
105-
"mapreduce.tasktracker.cache.local.keep.pct";
106-
10738
}

‎hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -80,55 +80,14 @@ private static void addDeprecatedKeys() {
8080
JTConfig.JT_TASKCACHE_LEVELS),
8181
new DeprecationDelta("mapred.job.tracker.retire.jobs",
8282
JTConfig.JT_RETIREJOBS),
83-
new DeprecationDelta("mapred.healthChecker.interval",
84-
TTConfig.TT_HEALTH_CHECKER_INTERVAL),
85-
new DeprecationDelta("mapred.healthChecker.script.args",
86-
TTConfig.TT_HEALTH_CHECKER_SCRIPT_ARGS),
87-
new DeprecationDelta("mapred.healthChecker.script.path",
88-
TTConfig.TT_HEALTH_CHECKER_SCRIPT_PATH),
89-
new DeprecationDelta("mapred.healthChecker.script.timeout",
90-
TTConfig.TT_HEALTH_CHECKER_SCRIPT_TIMEOUT),
91-
new DeprecationDelta("mapred.local.dir.minspacekill",
92-
TTConfig.TT_LOCAL_DIR_MINSPACE_KILL),
93-
new DeprecationDelta("mapred.local.dir.minspacestart",
94-
TTConfig.TT_LOCAL_DIR_MINSPACE_START),
95-
new DeprecationDelta("mapred.task.tracker.http.address",
96-
TTConfig.TT_HTTP_ADDRESS),
97-
new DeprecationDelta("mapred.task.tracker.report.address",
98-
TTConfig.TT_REPORT_ADDRESS),
99-
new DeprecationDelta("mapred.task.tracker.task-controller",
100-
TTConfig.TT_TASK_CONTROLLER),
101-
new DeprecationDelta("mapred.tasktracker.dns.interface",
102-
TTConfig.TT_DNS_INTERFACE),
103-
new DeprecationDelta("mapred.tasktracker.dns.nameserver",
104-
TTConfig.TT_DNS_NAMESERVER),
105-
new DeprecationDelta("mapred.tasktracker.events.batchsize",
106-
TTConfig.TT_MAX_TASK_COMPLETION_EVENTS_TO_POLL),
10783
new DeprecationDelta("mapred.tasktracker.indexcache.mb",
10884
TTConfig.TT_INDEX_CACHE),
109-
new DeprecationDelta("mapred.tasktracker.instrumentation",
110-
TTConfig.TT_INSTRUMENTATION),
11185
new DeprecationDelta("mapred.tasktracker.map.tasks.maximum",
11286
TTConfig.TT_MAP_SLOTS),
11387
new DeprecationDelta("mapred.tasktracker.memory_calculator_plugin",
11488
TTConfig.TT_RESOURCE_CALCULATOR_PLUGIN),
11589
new DeprecationDelta("mapred.tasktracker.memorycalculatorplugin",
11690
TTConfig.TT_RESOURCE_CALCULATOR_PLUGIN),
117-
new DeprecationDelta("mapred.tasktracker.reduce.tasks.maximum",
118-
TTConfig.TT_REDUCE_SLOTS),
119-
new DeprecationDelta(
120-
"mapred.tasktracker.tasks.sleeptime-before-sigkill",
121-
TTConfig.TT_SLEEP_TIME_BEFORE_SIG_KILL),
122-
new DeprecationDelta("slave.host.name",
123-
TTConfig.TT_HOST_NAME),
124-
new DeprecationDelta("tasktracker.http.threads",
125-
TTConfig.TT_HTTP_THREADS),
126-
new DeprecationDelta("hadoop.net.static.resolutions",
127-
TTConfig.TT_STATIC_RESOLUTIONS),
128-
new DeprecationDelta("local.cache.size",
129-
TTConfig.TT_LOCAL_CACHE_SIZE),
130-
new DeprecationDelta("tasktracker.contention.tracking",
131-
TTConfig.TT_CONTENTION_TRACKING),
13291
new DeprecationDelta("yarn.app.mapreduce.yarn.app.mapreduce.client-am.ipc.max-retries-on-timeouts",
13392
MRJobConfig.MR_CLIENT_TO_AM_IPC_MAX_RETRIES_ON_TIMEOUTS),
13493
new DeprecationDelta("job.end.notification.url",

0 commit comments

Comments
 (0)