hadoop git commit: YARN-6756. ContainerRequest#executionTypeRequest causes NPE. Contributed by Jian He

[jianhe]

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 9bcd64d23 -> 036cbd745


YARN-6756. ContainerRequest#executionTypeRequest causes NPE. Contributed by 
Jian He


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/036cbd74
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/036cbd74
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/036cbd74

Branch: refs/heads/branch-2
Commit: 036cbd745313598a8867d7fff11d110c90c2961a
Parents: 9bcd64d
Author: Jian He 
Authored: Tue Aug 29 20:35:53 2017 -0700
Committer: Jian He 
Committed: Tue Aug 29 20:36:23 2017 -0700

--
 .../java/org/apache/hadoop/yarn/client/api/AMRMClient.java | 5 +++--
 .../yarn/client/api/impl/TestAMRMClientContainerRequest.java   | 6 --
 2 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/036cbd74/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java
index bc4173f..1c3ac1c 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java
@@ -111,9 +111,10 @@ public abstract class AMRMClient extends
 private List racks;
 private Priority priority;
 private long allocationRequestId;
-private boolean relaxLocality;
+private boolean relaxLocality = true;
 private String nodeLabelsExpression;
-private ExecutionTypeRequest executionTypeRequest;
+private ExecutionTypeRequest executionTypeRequest =
+ExecutionTypeRequest.newInstance();
 
 /**
  * Instantiates a {@link ContainerRequest} with the given constraints and

http://git-wip-us.apache.org/repos/asf/hadoop/blob/036cbd74/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientContainerRequest.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientContainerRequest.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientContainerRequest.java
index ad18da3..9603539 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientContainerRequest.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientContainerRequest.java
@@ -51,8 +51,10 @@ public class TestAMRMClientContainerRequest {
 
 Resource capability = Resource.newInstance(1024, 1);
 ContainerRequest request =
-new ContainerRequest(capability, new String[] {"host1", "host2"},
-new String[] {"/rack2"}, Priority.newInstance(1));
+ContainerRequest.newBuilder().capability(capability)
+.nodes(new String[] { "host1", "host2" })
+.racks(new String[] { "/rack2" }).priority(Priority.newInstance(1))
+.build();
 client.addContainerRequest(request);
 verifyResourceRequest(client, request, "host1", true);
 verifyResourceRequest(client, request, "host2", true);


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

hadoop git commit: YARN-6756. ContainerRequest#executionTypeRequest causes NPE. Contributed by Jian He

[jianhe]

Repository: hadoop
Updated Branches:
  refs/heads/trunk cf93d60d3 -> 8201ed800


YARN-6756. ContainerRequest#executionTypeRequest causes NPE. Contributed by 
Jian He


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8201ed80
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8201ed80
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8201ed80

Branch: refs/heads/trunk
Commit: 8201ed8009e5f04c49568a8133635d47fcde3989
Parents: cf93d60
Author: Jian He 
Authored: Tue Aug 29 20:35:53 2017 -0700
Committer: Jian He 
Committed: Tue Aug 29 20:35:53 2017 -0700

--
 .../java/org/apache/hadoop/yarn/client/api/AMRMClient.java | 5 +++--
 .../yarn/client/api/impl/TestAMRMClientContainerRequest.java   | 6 --
 2 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/8201ed80/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java
index 69f3777..60e305f 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/AMRMClient.java
@@ -122,9 +122,10 @@ public abstract class AMRMClient extends
 private List racks;
 private Priority priority;
 private long allocationRequestId;
-private boolean relaxLocality;
+private boolean relaxLocality = true;
 private String nodeLabelsExpression;
-private ExecutionTypeRequest executionTypeRequest;
+private ExecutionTypeRequest executionTypeRequest =
+ExecutionTypeRequest.newInstance();
 
 /**
  * Instantiates a {@link ContainerRequest} with the given constraints and

http://git-wip-us.apache.org/repos/asf/hadoop/blob/8201ed80/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientContainerRequest.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientContainerRequest.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientContainerRequest.java
index ad18da3..9603539 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientContainerRequest.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientContainerRequest.java
@@ -51,8 +51,10 @@ public class TestAMRMClientContainerRequest {
 
 Resource capability = Resource.newInstance(1024, 1);
 ContainerRequest request =
-new ContainerRequest(capability, new String[] {"host1", "host2"},
-new String[] {"/rack2"}, Priority.newInstance(1));
+ContainerRequest.newBuilder().capability(capability)
+.nodes(new String[] { "host1", "host2" })
+.racks(new String[] { "/rack2" }).priority(Priority.newInstance(1))
+.build();
 client.addContainerRequest(request);
 verifyResourceRequest(client, request, "host1", true);
 verifyResourceRequest(client, request, "host2", true);


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org