[31/50] [abbrv] hadoop git commit: YARN-3318. Create Initial OrderingPolicy Framework and FifoOrderingPolicy. (Craig Welch via wangda)
YARN-3318. Create Initial OrderingPolicy Framework and FifoOrderingPolicy.
(Craig Welch via wangda)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e2cd8ed0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e2cd8ed0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e2cd8ed0
Branch: refs/heads/YARN-2928
Commit: e2cd8ed076c001de83b6f271792855bf682bdcca
Parents: 3980eec
Author: Wangda Tan wan...@apache.org
Authored: Wed Apr 15 09:56:32 2015 -0700
Committer: Zhijie Shen zjs...@apache.org
Committed: Fri Apr 17 15:29:44 2015 -0700
--
hadoop-yarn-project/CHANGES.txt | 3 +
.../dev-support/findbugs-exclude.xml| 4 +
.../scheduler/ResourceUsage.java| 55 -
.../AbstractComparatorOrderingPolicy.java | 119 +++
.../scheduler/policy/FifoComparator.java| 37 ++
.../scheduler/policy/FifoOrderingPolicy.java| 54 +
.../scheduler/policy/OrderingPolicy.java| 109 +
.../scheduler/policy/SchedulableEntity.java | 51
.../scheduler/policy/MockSchedulableEntity.java | 78
.../policy/TestFifoOrderingPolicy.java | 83 +
10 files changed, 592 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e2cd8ed0/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index f416ab2..e4755f6 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -134,6 +134,9 @@ Release 2.8.0 - UNRELEASED
YARN-3361. CapacityScheduler side changes to support non-exclusive node
labels. (Wangda Tan via jianhe)
+YARN-3318. Create Initial OrderingPolicy Framework and FifoOrderingPolicy.
+(Craig Welch via wangda)
+
IMPROVEMENTS
YARN-1880. Cleanup TestApplicationClientProtocolOnHA
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e2cd8ed0/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 375d19c..4b01a4d 100644
--- a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml
+++ b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml
@@ -141,6 +141,10 @@
Class
name=org.apache.hadoop.yarn.server.resourcemanager.resource.Priority$Comparator
/
Bug pattern=SE_COMPARATOR_SHOULD_BE_SERIALIZABLE /
/Match
+Match
+Class
name=org.apache.hadoop.yarn.server.resourcemanager.scheduler.policy.FifoComparator
/
+Bug pattern=SE_COMPARATOR_SHOULD_BE_SERIALIZABLE /
+ /Match
!-- Ignore some irrelevant class name warning --
Match
Class name=org.apache.hadoop.yarn.api.records.SerializedException /
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e2cd8ed0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.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/scheduler/ResourceUsage.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.java
index 5169b78..2f7e19d 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.java
@@ -57,7 +57,10 @@ public class ResourceUsage {
// Usage enum here to make implement cleaner
private enum ResourceType {
-USED(0), PENDING(1), AMUSED(2), RESERVED(3);
+//CACHED_USED and CACHED_PENDING may be read by anyone, but must only
+//be written by ordering policies
+USED(0), PENDING(1), AMUSED(2), RESERVED(3), CACHED_USED(4),
+ CACHED_PENDING(5);
private int idx;
@@ -102,6 +105,14 @@ public class ResourceUsage {
public Resource getUsed(String label) {
return _get(label, ResourceType.USED);
}
+
+ public Resource getCachedUsed(String label) {
+return _get(label, ResourceType.CACHED_USED);
+ }
+
+ public Resource getCachedPending(String label) {
+return _get(label,
hadoop git commit: YARN-3318. Create Initial OrderingPolicy Framework and FifoOrderingPolicy. (Craig Welch via wangda)
Repository: hadoop
Updated Branches:
refs/heads/trunk fddd55279 - 5004e7533
YARN-3318. Create Initial OrderingPolicy Framework and FifoOrderingPolicy.
(Craig Welch via wangda)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5004e753
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5004e753
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5004e753
Branch: refs/heads/trunk
Commit: 5004e753322084e42dfda4be1d2db66677f86a1e
Parents: fddd552
Author: Wangda Tan wan...@apache.org
Authored: Wed Apr 15 09:56:32 2015 -0700
Committer: Wangda Tan wan...@apache.org
Committed: Wed Apr 15 09:56:32 2015 -0700
--
hadoop-yarn-project/CHANGES.txt | 3 +
.../dev-support/findbugs-exclude.xml| 4 +
.../scheduler/ResourceUsage.java| 55 -
.../AbstractComparatorOrderingPolicy.java | 119 +++
.../scheduler/policy/FifoComparator.java| 37 ++
.../scheduler/policy/FifoOrderingPolicy.java| 54 +
.../scheduler/policy/OrderingPolicy.java| 109 +
.../scheduler/policy/SchedulableEntity.java | 51
.../scheduler/policy/MockSchedulableEntity.java | 78
.../policy/TestFifoOrderingPolicy.java | 83 +
10 files changed, 592 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5004e753/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 2db02a2a..ecdda61 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -75,6 +75,9 @@ Release 2.8.0 - UNRELEASED
YARN-3361. CapacityScheduler side changes to support non-exclusive node
labels. (Wangda Tan via jianhe)
+YARN-3318. Create Initial OrderingPolicy Framework and FifoOrderingPolicy.
+(Craig Welch via wangda)
+
IMPROVEMENTS
YARN-1880. Cleanup TestApplicationClientProtocolOnHA
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5004e753/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 375d19c..4b01a4d 100644
--- a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml
+++ b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml
@@ -141,6 +141,10 @@
Class
name=org.apache.hadoop.yarn.server.resourcemanager.resource.Priority$Comparator
/
Bug pattern=SE_COMPARATOR_SHOULD_BE_SERIALIZABLE /
/Match
+Match
+Class
name=org.apache.hadoop.yarn.server.resourcemanager.scheduler.policy.FifoComparator
/
+Bug pattern=SE_COMPARATOR_SHOULD_BE_SERIALIZABLE /
+ /Match
!-- Ignore some irrelevant class name warning --
Match
Class name=org.apache.hadoop.yarn.api.records.SerializedException /
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5004e753/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.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/scheduler/ResourceUsage.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.java
index 5169b78..2f7e19d 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.java
@@ -57,7 +57,10 @@ public class ResourceUsage {
// Usage enum here to make implement cleaner
private enum ResourceType {
-USED(0), PENDING(1), AMUSED(2), RESERVED(3);
+//CACHED_USED and CACHED_PENDING may be read by anyone, but must only
+//be written by ordering policies
+USED(0), PENDING(1), AMUSED(2), RESERVED(3), CACHED_USED(4),
+ CACHED_PENDING(5);
private int idx;
@@ -102,6 +105,14 @@ public class ResourceUsage {
public Resource getUsed(String label) {
return _get(label, ResourceType.USED);
}
+
+ public Resource getCachedUsed(String label) {
+return _get(label, ResourceType.CACHED_USED);
+ }
+
+ public
hadoop git commit: YARN-3318. Create Initial OrderingPolicy Framework and FifoOrderingPolicy. (Craig Welch via wangda)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 871bf6a76 - 89a7c9843
YARN-3318. Create Initial OrderingPolicy Framework and FifoOrderingPolicy.
(Craig Welch via wangda)
(cherry picked from commit 5004e753322084e42dfda4be1d2db66677f86a1e)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/89a7c984
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/89a7c984
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/89a7c984
Branch: refs/heads/branch-2
Commit: 89a7c9843605efcc9f6d6ee6df47260b035520dd
Parents: 871bf6a
Author: Wangda Tan wan...@apache.org
Authored: Wed Apr 15 09:56:32 2015 -0700
Committer: Wangda Tan wan...@apache.org
Committed: Wed Apr 15 09:57:52 2015 -0700
--
hadoop-yarn-project/CHANGES.txt | 3 +
.../dev-support/findbugs-exclude.xml| 4 +
.../scheduler/ResourceUsage.java| 55 -
.../AbstractComparatorOrderingPolicy.java | 119 +++
.../scheduler/policy/FifoComparator.java| 37 ++
.../scheduler/policy/FifoOrderingPolicy.java| 54 +
.../scheduler/policy/OrderingPolicy.java| 109 +
.../scheduler/policy/SchedulableEntity.java | 51
.../scheduler/policy/MockSchedulableEntity.java | 78
.../policy/TestFifoOrderingPolicy.java | 83 +
10 files changed, 592 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/89a7c984/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index b5e850e..bcbf445 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -27,6 +27,9 @@ Release 2.8.0 - UNRELEASED
YARN-3361. CapacityScheduler side changes to support non-exclusive node
labels. (Wangda Tan via jianhe)
+YARN-3318. Create Initial OrderingPolicy Framework and FifoOrderingPolicy.
+(Craig Welch via wangda)
+
IMPROVEMENTS
YARN-1880. Cleanup TestApplicationClientProtocolOnHA
http://git-wip-us.apache.org/repos/asf/hadoop/blob/89a7c984/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 375d19c..4b01a4d 100644
--- a/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml
+++ b/hadoop-yarn-project/hadoop-yarn/dev-support/findbugs-exclude.xml
@@ -141,6 +141,10 @@
Class
name=org.apache.hadoop.yarn.server.resourcemanager.resource.Priority$Comparator
/
Bug pattern=SE_COMPARATOR_SHOULD_BE_SERIALIZABLE /
/Match
+Match
+Class
name=org.apache.hadoop.yarn.server.resourcemanager.scheduler.policy.FifoComparator
/
+Bug pattern=SE_COMPARATOR_SHOULD_BE_SERIALIZABLE /
+ /Match
!-- Ignore some irrelevant class name warning --
Match
Class name=org.apache.hadoop.yarn.api.records.SerializedException /
http://git-wip-us.apache.org/repos/asf/hadoop/blob/89a7c984/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.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/scheduler/ResourceUsage.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.java
index 5169b78..2f7e19d 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/ResourceUsage.java
@@ -57,7 +57,10 @@ public class ResourceUsage {
// Usage enum here to make implement cleaner
private enum ResourceType {
-USED(0), PENDING(1), AMUSED(2), RESERVED(3);
+//CACHED_USED and CACHED_PENDING may be read by anyone, but must only
+//be written by ordering policies
+USED(0), PENDING(1), AMUSED(2), RESERVED(3), CACHED_USED(4),
+ CACHED_PENDING(5);
private int idx;
@@ -102,6 +105,14 @@ public class ResourceUsage {
public Resource getUsed(String label) {
return _get(label, ResourceType.USED);
}
+
+ public Resource getCachedUsed(String
