[06/50] [abbrv] hadoop git commit: YARN-2920. Changed CapacityScheduler to kill containers on nodes where node labels are changed. Contributed by Wangda Tan (cherry picked from commit fdf042dfffa4d247
YARN-2920. Changed CapacityScheduler to kill containers on nodes where node labels are changed. Contributed by Wangda Tan (cherry picked from commit fdf042dfffa4d2474e3cac86cfb8fe9ee4648beb) (cherry picked from commit 411836b74c6c02c0b5aebbbce29c209d93db1de2) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/88f022da Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/88f022da Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/88f022da Branch: refs/heads/branch-2.6 Commit: 88f022da245c5d34997494a822124d07f8a5f72f Parents: 2073fc0 Author: Jian HeAuthored: Mon Dec 22 16:50:15 2014 -0800 Committer: Vinod Kumar Vavilapalli Committed: Sat Sep 5 20:54:18 2015 -0700 -- .../hadoop/yarn/sls/nodemanager/NodeInfo.java | 3 +- .../yarn/sls/scheduler/RMNodeWrapper.java | 3 +- hadoop-yarn-project/CHANGES.txt | 3 + .../server/resourcemanager/ResourceManager.java | 1 + .../nodelabels/RMNodeLabelsManager.java | 23 +++ .../resourcemanager/rmnode/RMNodeImpl.java | 6 +- .../scheduler/SchedulerNode.java| 24 ++- .../scheduler/capacity/AbstractCSQueue.java | 5 + .../scheduler/capacity/CSQueue.java | 8 + .../scheduler/capacity/CapacityScheduler.java | 88 +++-- .../scheduler/capacity/LeafQueue.java | 26 +-- .../scheduler/capacity/ParentQueue.java | 24 ++- .../common/fica/FiCaSchedulerNode.java | 11 +- .../event/NodeLabelsUpdateSchedulerEvent.java | 37 .../scheduler/event/SchedulerEventType.java | 1 + .../yarn/server/resourcemanager/MockNodes.java | 3 +- .../TestCapacitySchedulerNodeLabelUpdate.java | 193 +++ 17 files changed, 414 insertions(+), 45 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/88f022da/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java -- diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java index fdddcf4..ee6eb7b 100644 --- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java +++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java @@ -34,6 +34,7 @@ import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.NodeState; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse; +import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; import org.apache.hadoop.yarn.server.resourcemanager.rmnode .UpdatedContainerInfo; @@ -162,7 +163,7 @@ public class NodeInfo { @Override public Set getNodeLabels() { - return null; + return RMNodeLabelsManager.EMPTY_STRING_SET; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/88f022da/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java -- diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java index 3b185ae..b64be1b 100644 --- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java +++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java @@ -27,6 +27,7 @@ import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.NodeState; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse; +import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; import org.apache.hadoop.yarn.server.resourcemanager.rmnode .UpdatedContainerInfo; @@ -150,6 +151,6 @@ public class RMNodeWrapper implements RMNode { @Override public Set getNodeLabels() { -return null; +return RMNodeLabelsManager.EMPTY_STRING_SET; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/88f022da/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 8244d61..fa1e120 100644 ---
[1/8] hadoop git commit: YARN-2920. Changed CapacityScheduler to kill containers on nodes where node labels are changed. Contributed by Wangda Tan (cherry picked from commit fdf042dfffa4d2474e3cac86cf
Repository: hadoop Updated Branches: refs/heads/branch-2.6.1 2073fc0f8 -> 233626490 YARN-2920. Changed CapacityScheduler to kill containers on nodes where node labels are changed. Contributed by Wangda Tan (cherry picked from commit fdf042dfffa4d2474e3cac86cfb8fe9ee4648beb) (cherry picked from commit 411836b74c6c02c0b5aebbbce29c209d93db1de2) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/88f022da Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/88f022da Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/88f022da Branch: refs/heads/branch-2.6.1 Commit: 88f022da245c5d34997494a822124d07f8a5f72f Parents: 2073fc0 Author: Jian HeAuthored: Mon Dec 22 16:50:15 2014 -0800 Committer: Vinod Kumar Vavilapalli Committed: Sat Sep 5 20:54:18 2015 -0700 -- .../hadoop/yarn/sls/nodemanager/NodeInfo.java | 3 +- .../yarn/sls/scheduler/RMNodeWrapper.java | 3 +- hadoop-yarn-project/CHANGES.txt | 3 + .../server/resourcemanager/ResourceManager.java | 1 + .../nodelabels/RMNodeLabelsManager.java | 23 +++ .../resourcemanager/rmnode/RMNodeImpl.java | 6 +- .../scheduler/SchedulerNode.java| 24 ++- .../scheduler/capacity/AbstractCSQueue.java | 5 + .../scheduler/capacity/CSQueue.java | 8 + .../scheduler/capacity/CapacityScheduler.java | 88 +++-- .../scheduler/capacity/LeafQueue.java | 26 +-- .../scheduler/capacity/ParentQueue.java | 24 ++- .../common/fica/FiCaSchedulerNode.java | 11 +- .../event/NodeLabelsUpdateSchedulerEvent.java | 37 .../scheduler/event/SchedulerEventType.java | 1 + .../yarn/server/resourcemanager/MockNodes.java | 3 +- .../TestCapacitySchedulerNodeLabelUpdate.java | 193 +++ 17 files changed, 414 insertions(+), 45 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/88f022da/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java -- diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java index fdddcf4..ee6eb7b 100644 --- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java +++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java @@ -34,6 +34,7 @@ import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.NodeState; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse; +import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; import org.apache.hadoop.yarn.server.resourcemanager.rmnode .UpdatedContainerInfo; @@ -162,7 +163,7 @@ public class NodeInfo { @Override public Set getNodeLabels() { - return null; + return RMNodeLabelsManager.EMPTY_STRING_SET; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/88f022da/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java -- diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java index 3b185ae..b64be1b 100644 --- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java +++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java @@ -27,6 +27,7 @@ import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.NodeState; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse; +import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; import org.apache.hadoop.yarn.server.resourcemanager.rmnode .UpdatedContainerInfo; @@ -150,6 +151,6 @@ public class RMNodeWrapper implements RMNode { @Override public Set getNodeLabels() { -return null; +return RMNodeLabelsManager.EMPTY_STRING_SET; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/88f022da/hadoop-yarn-project/CHANGES.txt -- diff --git
hadoop git commit: YARN-2920. Changed CapacityScheduler to kill containers on nodes where node labels are changed. Contributed by Wangda Tan (cherry picked from commit fdf042dfffa4d2474e3cac86cfb8fe9e
Repository: hadoop Updated Branches: refs/heads/branch-2 548612466 - 411836b74 YARN-2920. Changed CapacityScheduler to kill containers on nodes where node labels are changed. Contributed by Wangda Tan (cherry picked from commit fdf042dfffa4d2474e3cac86cfb8fe9ee4648beb) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/411836b7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/411836b7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/411836b7 Branch: refs/heads/branch-2 Commit: 411836b74c6c02c0b5aebbbce29c209d93db1de2 Parents: 5486124 Author: Jian He jia...@apache.org Authored: Mon Dec 22 16:50:15 2014 -0800 Committer: Jian He jia...@apache.org Committed: Mon Dec 22 16:52:15 2014 -0800 -- .../hadoop/yarn/sls/nodemanager/NodeInfo.java | 3 +- .../yarn/sls/scheduler/RMNodeWrapper.java | 3 +- hadoop-yarn-project/CHANGES.txt | 3 + .../server/resourcemanager/ResourceManager.java | 1 + .../nodelabels/RMNodeLabelsManager.java | 23 +++ .../resourcemanager/rmnode/RMNodeImpl.java | 6 +- .../scheduler/SchedulerNode.java| 24 ++- .../scheduler/capacity/AbstractCSQueue.java | 5 + .../scheduler/capacity/CSQueue.java | 8 + .../scheduler/capacity/CapacityScheduler.java | 76 +++- .../scheduler/capacity/LeafQueue.java | 26 +-- .../scheduler/capacity/ParentQueue.java | 24 ++- .../common/fica/FiCaSchedulerNode.java | 11 +- .../event/NodeLabelsUpdateSchedulerEvent.java | 37 .../scheduler/event/SchedulerEventType.java | 1 + .../yarn/server/resourcemanager/MockNodes.java | 3 +- .../TestCapacitySchedulerNodeLabelUpdate.java | 193 +++ 17 files changed, 410 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/411836b7/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java -- diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java index fdddcf4..ee6eb7b 100644 --- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java +++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java @@ -34,6 +34,7 @@ import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.NodeState; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse; +import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; import org.apache.hadoop.yarn.server.resourcemanager.rmnode .UpdatedContainerInfo; @@ -162,7 +163,7 @@ public class NodeInfo { @Override public SetString getNodeLabels() { - return null; + return RMNodeLabelsManager.EMPTY_STRING_SET; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/411836b7/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java -- diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java index 3b185ae..b64be1b 100644 --- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java +++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java @@ -27,6 +27,7 @@ import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.NodeState; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse; +import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; import org.apache.hadoop.yarn.server.resourcemanager.rmnode .UpdatedContainerInfo; @@ -150,6 +151,6 @@ public class RMNodeWrapper implements RMNode { @Override public SetString getNodeLabels() { -return null; +return RMNodeLabelsManager.EMPTY_STRING_SET; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/411836b7/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 96ff9fa..4bcc1c5 100644 ---
hadoop git commit: YARN-2920. Changed CapacityScheduler to kill containers on nodes where node labels are changed. Contributed by Wangda Tan
Repository: hadoop Updated Branches: refs/heads/trunk 2cf90a2c3 - fdf042dff YARN-2920. Changed CapacityScheduler to kill containers on nodes where node labels are changed. Contributed by Wangda Tan Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fdf042df Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fdf042df Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fdf042df Branch: refs/heads/trunk Commit: fdf042dfffa4d2474e3cac86cfb8fe9ee4648beb Parents: 2cf90a2 Author: Jian He jia...@apache.org Authored: Mon Dec 22 16:50:15 2014 -0800 Committer: Jian He jia...@apache.org Committed: Mon Dec 22 16:51:15 2014 -0800 -- .../hadoop/yarn/sls/nodemanager/NodeInfo.java | 3 +- .../yarn/sls/scheduler/RMNodeWrapper.java | 3 +- hadoop-yarn-project/CHANGES.txt | 3 + .../server/resourcemanager/ResourceManager.java | 1 + .../nodelabels/RMNodeLabelsManager.java | 23 +++ .../resourcemanager/rmnode/RMNodeImpl.java | 6 +- .../scheduler/SchedulerNode.java| 24 ++- .../scheduler/capacity/AbstractCSQueue.java | 5 + .../scheduler/capacity/CSQueue.java | 8 + .../scheduler/capacity/CapacityScheduler.java | 76 +++- .../scheduler/capacity/LeafQueue.java | 26 +-- .../scheduler/capacity/ParentQueue.java | 24 ++- .../common/fica/FiCaSchedulerNode.java | 11 +- .../event/NodeLabelsUpdateSchedulerEvent.java | 37 .../scheduler/event/SchedulerEventType.java | 1 + .../yarn/server/resourcemanager/MockNodes.java | 3 +- .../TestCapacitySchedulerNodeLabelUpdate.java | 193 +++ 17 files changed, 410 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fdf042df/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java -- diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java index fdddcf4..ee6eb7b 100644 --- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java +++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/nodemanager/NodeInfo.java @@ -34,6 +34,7 @@ import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.NodeState; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse; +import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; import org.apache.hadoop.yarn.server.resourcemanager.rmnode .UpdatedContainerInfo; @@ -162,7 +163,7 @@ public class NodeInfo { @Override public SetString getNodeLabels() { - return null; + return RMNodeLabelsManager.EMPTY_STRING_SET; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/fdf042df/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java -- diff --git a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java index 3b185ae..b64be1b 100644 --- a/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java +++ b/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/RMNodeWrapper.java @@ -27,6 +27,7 @@ import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.api.records.NodeState; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.server.api.protocolrecords.NodeHeartbeatResponse; +import org.apache.hadoop.yarn.server.resourcemanager.nodelabels.RMNodeLabelsManager; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; import org.apache.hadoop.yarn.server.resourcemanager.rmnode .UpdatedContainerInfo; @@ -150,6 +151,6 @@ public class RMNodeWrapper implements RMNode { @Override public SetString getNodeLabels() { -return null; +return RMNodeLabelsManager.EMPTY_STRING_SET; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/fdf042df/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 7a0904e..964c122 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -263,6 +263,9 @@