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 sh...@apache.org on 2017/06/02 23:55:46 UTC
hadoop git commit: YARN-4925. ContainerRequest in AMRMClient,
application should be able to specify nodes/racks together with
nodeLabelExpression. Contributed by Bibin A Chundatt
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 67e87c9af -> 4f2ff8540
YARN-4925. ContainerRequest in AMRMClient, application should be able to specify nodes/racks together with nodeLabelExpression. Contributed by Bibin A Chundatt
(cherry picked from commit f04c81c9ce93512bc714531a7731debbe6b794ce)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4f2ff854
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4f2ff854
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4f2ff854
Branch: refs/heads/branch-2.7
Commit: 4f2ff8540bcbea85786e2afae0fdae5a5031eb10
Parents: 67e87c9
Author: Naganarasimha <na...@apache.org>
Authored: Thu May 19 01:30:12 2016 +0800
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Fri Jun 2 16:53:38 2017 -0700
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../hadoop/yarn/client/api/impl/AMRMClientImpl.java | 10 ----------
.../hadoop/yarn/client/api/impl/TestAMRMClient.java | 12 ++++++++++++
3 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4f2ff854/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 1eb4855..df99dd2 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -102,6 +102,9 @@ Release 2.7.4 - UNRELEASED
YARN-6304. Skip rm.transitionToActive call to RM if RM is already active.
(Rohith Sharma K S via junping_du)
+ YARN-4925. ContainerRequest in AMRMClient, application should be able to
+ specify nodes/racks together with nodeLabelExpression. Bibin A Chundatt
+
Release 2.7.3 - 2016-08-25
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4f2ff854/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java
index b1324c1..c9a81be 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java
@@ -607,16 +607,6 @@ public class AMRMClientImpl<T extends ContainerRequest> extends AMRMClient<T> {
"Cannot specify more than two node labels"
+ " in a single node label expression");
}
-
- // Don't allow specify node label against ANY request
- if ((containerRequest.getRacks() != null &&
- (!containerRequest.getRacks().isEmpty()))
- ||
- (containerRequest.getNodes() != null &&
- (!containerRequest.getNodes().isEmpty()))) {
- throw new InvalidContainerRequestException(
- "Cannot specify node label with rack and node");
- }
}
private void addResourceRequestToAsk(ResourceRequest remoteRequest) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4f2ff854/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
index 7d29d05..f2f3587 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
@@ -39,6 +39,7 @@ import java.util.Set;
import java.util.TreeSet;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.security.SecurityUtil;
@@ -708,6 +709,17 @@ public class TestAMRMClient {
Assert.assertNull(req.getNodeLabelExpression());
}
}
+ // set container with nodes and racks with labels
+ client.addContainerRequest(new ContainerRequest(
+ Resource.newInstance(1024, 1), new String[] { "rack1" },
+ new String[] { "node1", "node2" }, Priority.UNDEFINED, true, "y"));
+ for (ResourceRequest req : client.ask) {
+ if (ResourceRequest.ANY.equals(req.getResourceName())) {
+ Assert.assertEquals("y", req.getNodeLabelExpression());
+ } else {
+ Assert.assertNull(req.getNodeLabelExpression());
+ }
+ }
}
private void verifyAddRequestFailed(AMRMClient<ContainerRequest> client,
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org