Repository: hadoop Updated Branches: refs/heads/branch-3.1 610b00bdf -> 85ae097f3
MAPREDUCE-7137. MRAppBenchmark.benchmark1() fails with NullPointerException. Contributed by Oleksandr Shevchenko (cherry picked from commit 34b2237e420cfbe3a97ddd44968de8bbe1ed30ab) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/85ae097f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/85ae097f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/85ae097f Branch: refs/heads/branch-3.1 Commit: 85ae097f3c728dd49b0deaf5fbace2186e72d678 Parents: 610b00b Author: Jason Lowe <[email protected]> Authored: Tue Sep 18 16:56:31 2018 -0500 Committer: Jason Lowe <[email protected]> Committed: Tue Sep 18 17:08:35 2018 -0500 ---------------------------------------------------------------------- .../java/org/apache/hadoop/mapreduce/v2/app/MRAppBenchmark.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/85ae097f/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRAppBenchmark.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRAppBenchmark.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRAppBenchmark.java index 025a8fa..5e6697b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRAppBenchmark.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRAppBenchmark.java @@ -47,6 +47,7 @@ import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterRespo import org.apache.hadoop.yarn.api.records.Container; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.NodeId; +import org.apache.hadoop.yarn.api.records.Priority; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.ResourceRequest; import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; @@ -184,7 +185,7 @@ public class MRAppBenchmark { } } - @Test + @Test(timeout = 60000) public void benchmark1() throws Exception { int maps = 100; // Adjust for benchmarking. Start with thousands. int reduces = 0; @@ -211,6 +212,7 @@ public class MRAppBenchmark { Records.newRecord(RegisterApplicationMasterResponse.class); response.setMaximumResourceCapability(Resource.newInstance( 10240, 1)); + response.setQueue("queue1"); return response; } @@ -252,6 +254,7 @@ public class MRAppBenchmark { response.setAllocatedContainers(containers); response.setResponseId(request.getResponseId() + 1); response.setNumClusterNodes(350); + response.setApplicationPriority(Priority.newInstance(100)); return response; } }; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
