[03/50] [abbrv] hadoop git commit: YARN-3272. Surface container locality info in RM web UI (Jian He via wangda)
YARN-3272. Surface container locality info in RM web UI (Jian He via wangda) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4006739a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4006739a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4006739a Branch: refs/heads/HDFS-7285 Commit: 4006739a2883ccc26d7c1af837d989bc529eb50d Parents: 6bc2798 Author: Wangda Tan wan...@apache.org Authored: Tue Mar 3 11:49:01 2015 -0800 Committer: Jing Zhao ji...@apache.org Committed: Mon Mar 9 13:11:22 2015 -0700 -- hadoop-yarn-project/CHANGES.txt | 3 + .../dev-support/findbugs-exclude.xml| 7 ++ .../rmapp/attempt/RMAppAttemptMetrics.java | 21 - .../resourcemanager/scheduler/NodeType.java | 9 +- .../scheduler/SchedulerApplicationAttempt.java | 15 +++- .../scheduler/capacity/LeafQueue.java | 95 +--- .../server/resourcemanager/webapp/AppBlock.java | 45 +- .../scheduler/capacity/TestReservations.java| 8 +- 8 files changed, 163 insertions(+), 40 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4006739a/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 0850f0b..5eaf4f4 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -348,6 +348,9 @@ Release 2.7.0 - UNRELEASED YARN-3281. Added RMStateStore to StateMachine visualization list. (Chengbing Liu via jianhe) +YARN-3272. Surface container locality info in RM web UI. +(Jian He via wangda) + OPTIMIZATIONS YARN-2990. FairScheduler's delay-scheduling always waits for node-local and http://git-wip-us.apache.org/repos/asf/hadoop/blob/4006739a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml -- diff --git a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml index 70f1a71..1c3f201 100644 --- a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml +++ b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml @@ -63,6 +63,13 @@ Bug pattern=BC_UNCONFIRMED_CAST / /Match Match +Class name=~org\.apache\.hadoop\.yarn\.server\.resourcemanager\.rmapp\.attempt\.RMAppAttemptMetrics / +Method name=getLocalityStatistics / +Bug pattern=EI_EXPOSE_REP / +Method name=incNumAllocatedContainers/ +Bug pattern=VO_VOLATILE_INCREMENT / + /Match + Match Class name=org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppImpl$AppRejectedTransition / Bug pattern=BC_UNCONFIRMED_CAST / /Match http://git-wip-us.apache.org/repos/asf/hadoop/blob/4006739a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.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/rmapp/attempt/RMAppAttemptMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java index 0e60fd5..bc22073 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java @@ -32,6 +32,7 @@ import org.apache.hadoop.yarn.api.records.ApplicationResourceUsageReport; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.server.resourcemanager.RMContext; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.NodeType; import org.apache.hadoop.yarn.util.resource.Resources; public class RMAppAttemptMetrics { @@ -49,6 +50,10 @@ public class RMAppAttemptMetrics { private AtomicLong finishedVcoreSeconds = new AtomicLong(0); private RMContext rmContext; + private int[][] localityStatistics = + new int[NodeType.values().length][NodeType.values().length]; + private volatile int totalAllocatedContainers; + public RMAppAttemptMetrics(ApplicationAttemptId attemptId, RMContext rmContext) {
[01/27] hadoop git commit: YARN-3272. Surface container locality info in RM web UI (Jian He via wangda)
Repository: hadoop Updated Branches: refs/heads/YARN-2928 d3ff7f06c - 821b68d05 YARN-3272. Surface container locality info in RM web UI (Jian He via wangda) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e17e5ba9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e17e5ba9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e17e5ba9 Branch: refs/heads/YARN-2928 Commit: e17e5ba9d7e2bd45ba6884f59f8045817594b284 Parents: 1004473 Author: Wangda Tan wan...@apache.org Authored: Tue Mar 3 11:49:01 2015 -0800 Committer: Wangda Tan wan...@apache.org Committed: Tue Mar 3 11:49:01 2015 -0800 -- hadoop-yarn-project/CHANGES.txt | 3 + .../dev-support/findbugs-exclude.xml| 7 ++ .../rmapp/attempt/RMAppAttemptMetrics.java | 21 - .../resourcemanager/scheduler/NodeType.java | 9 +- .../scheduler/SchedulerApplicationAttempt.java | 15 +++- .../scheduler/capacity/LeafQueue.java | 95 +--- .../server/resourcemanager/webapp/AppBlock.java | 45 +- .../scheduler/capacity/TestReservations.java| 8 +- 8 files changed, 163 insertions(+), 40 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e17e5ba9/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 0850f0b..5eaf4f4 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -348,6 +348,9 @@ Release 2.7.0 - UNRELEASED YARN-3281. Added RMStateStore to StateMachine visualization list. (Chengbing Liu via jianhe) +YARN-3272. Surface container locality info in RM web UI. +(Jian He via wangda) + OPTIMIZATIONS YARN-2990. FairScheduler's delay-scheduling always waits for node-local and http://git-wip-us.apache.org/repos/asf/hadoop/blob/e17e5ba9/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml -- diff --git a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml index 70f1a71..1c3f201 100644 --- a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml +++ b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml @@ -63,6 +63,13 @@ Bug pattern=BC_UNCONFIRMED_CAST / /Match Match +Class name=~org\.apache\.hadoop\.yarn\.server\.resourcemanager\.rmapp\.attempt\.RMAppAttemptMetrics / +Method name=getLocalityStatistics / +Bug pattern=EI_EXPOSE_REP / +Method name=incNumAllocatedContainers/ +Bug pattern=VO_VOLATILE_INCREMENT / + /Match + Match Class name=org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppImpl$AppRejectedTransition / Bug pattern=BC_UNCONFIRMED_CAST / /Match http://git-wip-us.apache.org/repos/asf/hadoop/blob/e17e5ba9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.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/rmapp/attempt/RMAppAttemptMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java index 0e60fd5..bc22073 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java @@ -32,6 +32,7 @@ import org.apache.hadoop.yarn.api.records.ApplicationResourceUsageReport; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.server.resourcemanager.RMContext; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.NodeType; import org.apache.hadoop.yarn.util.resource.Resources; public class RMAppAttemptMetrics { @@ -49,6 +50,10 @@ public class RMAppAttemptMetrics { private AtomicLong finishedVcoreSeconds = new AtomicLong(0); private RMContext rmContext; + private int[][] localityStatistics = + new int[NodeType.values().length][NodeType.values().length]; + private volatile int totalAllocatedContainers; + public
hadoop git commit: YARN-3272. Surface container locality info in RM web UI (Jian He via wangda)
Repository: hadoop Updated Branches: refs/heads/branch-2 7e6624c21 - 0a502c665 YARN-3272. Surface container locality info in RM web UI (Jian He via wangda) (cherry picked from commit e17e5ba9d7e2bd45ba6884f59f8045817594b284) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0a502c66 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0a502c66 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0a502c66 Branch: refs/heads/branch-2 Commit: 0a502c665b51e114ad3624062cd440d26b0fa6e3 Parents: 7e6624c Author: Wangda Tan wan...@apache.org Authored: Tue Mar 3 11:49:01 2015 -0800 Committer: Wangda Tan wan...@apache.org Committed: Tue Mar 3 11:49:45 2015 -0800 -- hadoop-yarn-project/CHANGES.txt | 3 + .../dev-support/findbugs-exclude.xml| 7 ++ .../rmapp/attempt/RMAppAttemptMetrics.java | 21 - .../resourcemanager/scheduler/NodeType.java | 9 +- .../scheduler/SchedulerApplicationAttempt.java | 15 +++- .../scheduler/capacity/LeafQueue.java | 95 +--- .../server/resourcemanager/webapp/AppBlock.java | 45 +- .../scheduler/capacity/TestReservations.java| 8 +- 8 files changed, 163 insertions(+), 40 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0a502c66/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 73bcaf0..ae7b942 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -303,6 +303,9 @@ Release 2.7.0 - UNRELEASED YARN-3281. Added RMStateStore to StateMachine visualization list. (Chengbing Liu via jianhe) +YARN-3272. Surface container locality info in RM web UI. +(Jian He via wangda) + OPTIMIZATIONS YARN-2990. FairScheduler's delay-scheduling always waits for node-local and http://git-wip-us.apache.org/repos/asf/hadoop/blob/0a502c66/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml -- diff --git a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml index 70f1a71..1c3f201 100644 --- a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml +++ b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml @@ -63,6 +63,13 @@ Bug pattern=BC_UNCONFIRMED_CAST / /Match Match +Class name=~org\.apache\.hadoop\.yarn\.server\.resourcemanager\.rmapp\.attempt\.RMAppAttemptMetrics / +Method name=getLocalityStatistics / +Bug pattern=EI_EXPOSE_REP / +Method name=incNumAllocatedContainers/ +Bug pattern=VO_VOLATILE_INCREMENT / + /Match + Match Class name=org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppImpl$AppRejectedTransition / Bug pattern=BC_UNCONFIRMED_CAST / /Match http://git-wip-us.apache.org/repos/asf/hadoop/blob/0a502c66/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.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/rmapp/attempt/RMAppAttemptMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java index 0e60fd5..bc22073 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java @@ -32,6 +32,7 @@ import org.apache.hadoop.yarn.api.records.ApplicationResourceUsageReport; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.server.resourcemanager.RMContext; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.NodeType; import org.apache.hadoop.yarn.util.resource.Resources; public class RMAppAttemptMetrics { @@ -49,6 +50,10 @@ public class RMAppAttemptMetrics { private AtomicLong finishedVcoreSeconds = new AtomicLong(0); private RMContext rmContext; + private int[][] localityStatistics = + new int[NodeType.values().length][NodeType.values().length]; +
hadoop git commit: YARN-3272. Surface container locality info in RM web UI (Jian He via wangda)
Repository: hadoop Updated Branches: refs/heads/trunk 1004473aa - e17e5ba9d YARN-3272. Surface container locality info in RM web UI (Jian He via wangda) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e17e5ba9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e17e5ba9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e17e5ba9 Branch: refs/heads/trunk Commit: e17e5ba9d7e2bd45ba6884f59f8045817594b284 Parents: 1004473 Author: Wangda Tan wan...@apache.org Authored: Tue Mar 3 11:49:01 2015 -0800 Committer: Wangda Tan wan...@apache.org Committed: Tue Mar 3 11:49:01 2015 -0800 -- hadoop-yarn-project/CHANGES.txt | 3 + .../dev-support/findbugs-exclude.xml| 7 ++ .../rmapp/attempt/RMAppAttemptMetrics.java | 21 - .../resourcemanager/scheduler/NodeType.java | 9 +- .../scheduler/SchedulerApplicationAttempt.java | 15 +++- .../scheduler/capacity/LeafQueue.java | 95 +--- .../server/resourcemanager/webapp/AppBlock.java | 45 +- .../scheduler/capacity/TestReservations.java| 8 +- 8 files changed, 163 insertions(+), 40 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e17e5ba9/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 0850f0b..5eaf4f4 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -348,6 +348,9 @@ Release 2.7.0 - UNRELEASED YARN-3281. Added RMStateStore to StateMachine visualization list. (Chengbing Liu via jianhe) +YARN-3272. Surface container locality info in RM web UI. +(Jian He via wangda) + OPTIMIZATIONS YARN-2990. FairScheduler's delay-scheduling always waits for node-local and http://git-wip-us.apache.org/repos/asf/hadoop/blob/e17e5ba9/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml -- diff --git a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml index 70f1a71..1c3f201 100644 --- a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml +++ b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml @@ -63,6 +63,13 @@ Bug pattern=BC_UNCONFIRMED_CAST / /Match Match +Class name=~org\.apache\.hadoop\.yarn\.server\.resourcemanager\.rmapp\.attempt\.RMAppAttemptMetrics / +Method name=getLocalityStatistics / +Bug pattern=EI_EXPOSE_REP / +Method name=incNumAllocatedContainers/ +Bug pattern=VO_VOLATILE_INCREMENT / + /Match + Match Class name=org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppImpl$AppRejectedTransition / Bug pattern=BC_UNCONFIRMED_CAST / /Match http://git-wip-us.apache.org/repos/asf/hadoop/blob/e17e5ba9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.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/rmapp/attempt/RMAppAttemptMetrics.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java index 0e60fd5..bc22073 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptMetrics.java @@ -32,6 +32,7 @@ import org.apache.hadoop.yarn.api.records.ApplicationResourceUsageReport; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.server.resourcemanager.RMContext; import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.NodeType; import org.apache.hadoop.yarn.util.resource.Resources; public class RMAppAttemptMetrics { @@ -49,6 +50,10 @@ public class RMAppAttemptMetrics { private AtomicLong finishedVcoreSeconds = new AtomicLong(0); private RMContext rmContext; + private int[][] localityStatistics = + new int[NodeType.values().length][NodeType.values().length]; + private volatile int totalAllocatedContainers; + public