Skip to content

Commit f242db0

Browse files
author
Ashutosh Gupta
committed
Removing config for liveness check and making it default
1 parent 9c969c3 commit f242db0

File tree

3 files changed

+1
-17
lines changed

3 files changed

+1
-17
lines changed

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -410,10 +410,7 @@ public AMFeedback statusUpdate(TaskAttemptID taskAttemptID,
410410
LOG.debug("Ping from " + taskAttemptID.toString());
411411
}
412412
// Consider ping from the tasks for liveliness check
413-
if (getConfig().getBoolean(MRJobConfig.MR_TASK_ENABLE_PING_FOR_LIVELINESS_CHECK,
414-
MRJobConfig.DEFAULT_MR_TASK_ENABLE_PING_FOR_LIVELINESS_CHECK)) {
415-
taskHeartbeatHandler.progressing(yarnAttemptID);
416-
}
413+
taskHeartbeatHandler.progressing(yarnAttemptID);
417414
return feedback;
418415
}
419416

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/MRJobConfig.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -919,12 +919,6 @@ public interface MRJobConfig {
919919
MR_AM_PREFIX + "scheduler.heartbeat.interval-ms";
920920
public static final int DEFAULT_MR_AM_TO_RM_HEARTBEAT_INTERVAL_MS = 1000;
921921

922-
/** Whether to consider ping from tasks in liveliness check. */
923-
String MR_TASK_ENABLE_PING_FOR_LIVELINESS_CHECK =
924-
"mapreduce.task.enable.ping-for-liveliness-check";
925-
boolean DEFAULT_MR_TASK_ENABLE_PING_FOR_LIVELINESS_CHECK
926-
= true;
927-
928922
/**
929923
* If contact with RM is lost, the AM will wait MR_AM_TO_RM_WAIT_INTERVAL_MS
930924
* milliseconds before aborting. During this interval, AM will still try

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -286,13 +286,6 @@
286286
</description>
287287
</property>
288288

289-
<property>
290-
<name>mapreduce.task.enable.ping-for-liveliness-check</name>
291-
<value>true</value>
292-
<description>Whether to consider ping from tasks in liveliness check.
293-
</description>
294-
</property>
295-
296289
<property>
297290
<name>mapreduce.map.memory.mb</name>
298291
<value>-1</value>

0 commit comments

Comments
 (0)