Repository: hadoop Updated Branches: refs/heads/branch-2 be7e4a080 -> b204a1eb5
HADOOP-13858. TestGridmixMemoryEmulation and TestResourceUsageEmulators fail on the environment other than Linux or Windows. (cherry picked from commit 98c35bb1a4faf794060612bee7494d501701b698) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b204a1eb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b204a1eb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b204a1eb Branch: refs/heads/branch-2 Commit: b204a1eb5f2962a4ec5fa92537ae472b87cffb52 Parents: be7e4a0 Author: Akira Ajisaka <[email protected]> Authored: Sat Jan 21 17:31:20 2017 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Sat Jan 21 17:35:57 2017 +0900 ---------------------------------------------------------------------- .../hadoop/mapred/gridmix/DummyResourceCalculatorPlugin.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b204a1eb/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DummyResourceCalculatorPlugin.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DummyResourceCalculatorPlugin.java b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DummyResourceCalculatorPlugin.java index 01d9242..528202f 100644 --- a/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DummyResourceCalculatorPlugin.java +++ b/hadoop-tools/hadoop-gridmix/src/test/java/org/apache/hadoop/mapred/gridmix/DummyResourceCalculatorPlugin.java @@ -31,6 +31,10 @@ import org.apache.hadoop.yarn.util.ResourceCalculatorPlugin; @InterfaceAudience.Private public class DummyResourceCalculatorPlugin extends ResourceCalculatorPlugin { + DummyResourceCalculatorPlugin() { + super(null); + } + /** max vmem on the TT */ public static final String MAXVMEM_TESTING_PROPERTY = "mapred.tasktracker.maxvmem.testing"; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
