You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vv...@apache.org on 2016/04/01 08:57:54 UTC
[1/2] hadoop git commit: Revert "YARN-4857. Add missing default
configuration regarding preemption of CapacityScheduler. Contributed by Kai
Sasaki."
Repository: hadoop
Updated Branches:
refs/heads/branch-2 80d122d7f -> 10d8f8a39
refs/heads/trunk a8d8b80a2 -> 3488c4f2c
Revert "YARN-4857. Add missing default configuration regarding preemption of CapacityScheduler. Contributed by Kai Sasaki."
This reverts commit 0064cba169d1bb761f6e81ee86830be598d7c500.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3488c4f2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3488c4f2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3488c4f2
Branch: refs/heads/trunk
Commit: 3488c4f2c9767684eb1007bb00250f474c06d5d8
Parents: a8d8b80
Author: Varun Vasudev <vv...@apache.org>
Authored: Fri Apr 1 12:20:40 2016 +0530
Committer: Varun Vasudev <vv...@apache.org>
Committed: Fri Apr 1 12:20:40 2016 +0530
----------------------------------------------------------------------
.../src/main/resources/yarn-default.xml | 58 --------------------
1 file changed, 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3488c4f2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index cb3c73a..506cf3d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -908,64 +908,6 @@
<value>600000</value>
</property>
- <property>
- <description>
- If true, run the policy but do not affect the cluster with preemption and kill events.
- </description>
- <name>yarn.resourcemanager.monitor.capacity.preemption.observe_only</name>
- <value>false</value>
- </property>
-
- <property>
- <description>
- Time in milliseconds between invocations of this ProportionalCapacityPreemptionPolicy
- policy.
- </description>
- <name>yarn.resourcemanager.monitor.capacity.preemption.monitoring_interval</name>
- <value>3000</value>
- </property>
-
- <property>
- <description>
- Time in milliseconds between requesting a preemption from an application and killing
- the container.
- </description>
- <name>yarn.resourcemanager.monitor.capacity.preemption.max_wait_before_kill</name>
- <value>15000</value>
- </property>
-
- <property>
- <description>
- Maximum percentage of resources preempted in a single round. By controlling this valueone
- can throttle the pace at which containers are reclaimed from the cluster. After computing
- the total desired preemption, the policy scales it back within this limit.
- </description>
- <name>yarn.resourcemanager.monitor.capacity.preemption.total_preemption_per_round</name>
- <value>0.1</value>
- </property>
-
- <property>
- <description>
- Maximum amount of resources above the target capacity ignored for preemption.
- This defines a deadzone around the target capacity that helps prevent thrashing and
- oscillations around the computed target balance. High values would slow the time to capacity
- and (absent natural.completions) it might prevent convergence to guaranteed capacity.
- </description>
- <name>yarn.resourcemanager.monitor.capacity.preemption.max_ignored_over_capacity</name>
- <value>0.1</value>
- </property>
-
- <property>
- <description>
- Given a computed preemption target, account for containers naturally expiring and preempt
- only this percentage of the delta. This determines the rate of geometric convergence into
- the deadzone (MAX_IGNORED_OVER_CAPACITY). For example, a termination factor of 0.5 will reclaim
- almost 95% of resources within 5 * #WAIT_TIME_BEFORE_KILL, even absent natural termination.
- </description>
- <name>yarn.resourcemanager.monitor.capacity.preemption.natural_termination_factor</name>
- <value>0.2</value>
- </property>
-
<!-- Node Manager Configuration -->
<property>
[2/2] hadoop git commit: Revert "YARN-4857. Add missing default
configuration regarding preemption of CapacityScheduler. Contributed by Kai
Sasaki."
Posted by vv...@apache.org.
Revert "YARN-4857. Add missing default configuration regarding preemption of CapacityScheduler. Contributed by Kai Sasaki."
This reverts commit 0064cba169d1bb761f6e81ee86830be598d7c500.
(cherry picked from commit 3488c4f2c9767684eb1007bb00250f474c06d5d8)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/10d8f8a3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/10d8f8a3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/10d8f8a3
Branch: refs/heads/branch-2
Commit: 10d8f8a39c51d3ac39e646e016138f67df12fd45
Parents: 80d122d
Author: Varun Vasudev <vv...@apache.org>
Authored: Fri Apr 1 12:20:40 2016 +0530
Committer: Varun Vasudev <vv...@apache.org>
Committed: Fri Apr 1 12:21:49 2016 +0530
----------------------------------------------------------------------
.../src/main/resources/yarn-default.xml | 58 --------------------
1 file changed, 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/10d8f8a3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index cb3c73a..506cf3d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -908,64 +908,6 @@
<value>600000</value>
</property>
- <property>
- <description>
- If true, run the policy but do not affect the cluster with preemption and kill events.
- </description>
- <name>yarn.resourcemanager.monitor.capacity.preemption.observe_only</name>
- <value>false</value>
- </property>
-
- <property>
- <description>
- Time in milliseconds between invocations of this ProportionalCapacityPreemptionPolicy
- policy.
- </description>
- <name>yarn.resourcemanager.monitor.capacity.preemption.monitoring_interval</name>
- <value>3000</value>
- </property>
-
- <property>
- <description>
- Time in milliseconds between requesting a preemption from an application and killing
- the container.
- </description>
- <name>yarn.resourcemanager.monitor.capacity.preemption.max_wait_before_kill</name>
- <value>15000</value>
- </property>
-
- <property>
- <description>
- Maximum percentage of resources preempted in a single round. By controlling this valueone
- can throttle the pace at which containers are reclaimed from the cluster. After computing
- the total desired preemption, the policy scales it back within this limit.
- </description>
- <name>yarn.resourcemanager.monitor.capacity.preemption.total_preemption_per_round</name>
- <value>0.1</value>
- </property>
-
- <property>
- <description>
- Maximum amount of resources above the target capacity ignored for preemption.
- This defines a deadzone around the target capacity that helps prevent thrashing and
- oscillations around the computed target balance. High values would slow the time to capacity
- and (absent natural.completions) it might prevent convergence to guaranteed capacity.
- </description>
- <name>yarn.resourcemanager.monitor.capacity.preemption.max_ignored_over_capacity</name>
- <value>0.1</value>
- </property>
-
- <property>
- <description>
- Given a computed preemption target, account for containers naturally expiring and preempt
- only this percentage of the delta. This determines the rate of geometric convergence into
- the deadzone (MAX_IGNORED_OVER_CAPACITY). For example, a termination factor of 0.5 will reclaim
- almost 95% of resources within 5 * #WAIT_TIME_BEFORE_KILL, even absent natural termination.
- </description>
- <name>yarn.resourcemanager.monitor.capacity.preemption.natural_termination_factor</name>
- <value>0.2</value>
- </property>
-
<!-- Node Manager Configuration -->
<property>