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 jl...@apache.org on 2015/11/21 00:13:42 UTC
hadoop git commit: YARN-4374. RM capacity scheduler UI rounds user
limit factor. Contributed by Chang Li (cherry picked from commit
060cdcbe5db56383e74e282ac61eedff8248c11b)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 b7e3f419b -> f3bca8bc1
YARN-4374. RM capacity scheduler UI rounds user limit factor. Contributed by Chang Li
(cherry picked from commit 060cdcbe5db56383e74e282ac61eedff8248c11b)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f3bca8bc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f3bca8bc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f3bca8bc
Branch: refs/heads/branch-2
Commit: f3bca8bc1adce9497dc374589518b3e66eb67c60
Parents: b7e3f41
Author: Jason Lowe <jl...@apache.org>
Authored: Fri Nov 20 23:12:29 2015 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Fri Nov 20 23:13:27 2015 +0000
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3bca8bc/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index adf4a31..d3abfe5 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1023,6 +1023,9 @@ Release 2.7.3 - UNRELEASED
YARN-4347. Resource manager fails with Null pointer exception. (Jian He via wangda)
+ YARN-4374. RM capacity scheduler UI rounds user limit factor (Chang Li via
+ jlowe)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3bca8bc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
index 66f2cac..1cedac4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/CapacitySchedulerPage.java
@@ -157,8 +157,7 @@ class CapacitySchedulerPage extends RmView {
_("Used Application Master Resources:", lqinfo.getUsedAMResource().toString()).
_("Max Application Master Resources Per User:", lqinfo.getUserAMResourceLimit().toString()).
_("Configured Minimum User Limit Percent:", Integer.toString(lqinfo.getUserLimit()) + "%").
- _("Configured User Limit Factor:", StringUtils.format(
- "%.1f", lqinfo.getUserLimitFactor())).
+ _("Configured User Limit Factor:", lqinfo.getUserLimitFactor()).
_("Accessible Node Labels:", StringUtils.join(",", lqinfo.getNodeLabels())).
_("Ordering Policy: ", lqinfo.getOrderingPolicyInfo()).
_("Preemption:", lqinfo.getPreemptionDisabled() ? "disabled" : "enabled").