This is an automated email from the ASF dual-hosted git repository. jhung pushed a commit to branch YARN-8200 in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit ecc13343901791d565cf05d83eb35ef768ed4db9 Author: Jonathan Hung <[email protected]> AuthorDate: Mon Feb 4 14:34:45 2019 -0800 fix java7 incompat --- .../nodemanager/TestDockerContainerExecutorWithMocks.java | 2 +- .../linux/resources/gpu/TestGpuResourceHandler.java | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDockerContainerExecutorWithMocks.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDockerContainerExecutorWithMocks.java index f1194c9..7e1752b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDockerContainerExecutorWithMocks.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestDockerContainerExecutorWithMocks.java @@ -116,7 +116,7 @@ public class TestDockerContainerExecutorWithMocks { public void testContainerInitSecure() throws IOException { dockerContainerExecutor.getConf().set( CommonConfigurationKeys.HADOOP_SECURITY_AUTHENTICATION, "kerberos"); - dockerContainerExecutor.init(); + dockerContainerExecutor.init(mock(Context.class)); } @Test(expected = IllegalArgumentException.class) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java index 5c70f7a..d3ddd1b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/linux/resources/gpu/TestGpuResourceHandler.java @@ -45,6 +45,7 @@ import org.junit.Before; import org.junit.Test; import java.io.IOException; +import java.io.Serializable; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -231,7 +232,7 @@ public class TestGpuResourceHandler { /* Start container 1, asks 0 containers */ gpuResourceHandler.preStart(mockContainerWithGpuRequest(1, 0)); - verifyDeniedDevices(getContainerId(1), Collections.emptyList()); + verifyDeniedDevices(getContainerId(1), Collections.<Integer>emptyList()); /* Start container 2, asks 1 containers. Excepted to fail */ boolean failedToAllocate = false; @@ -267,7 +268,7 @@ public class TestGpuResourceHandler { verify(mockNMStateStore).storeAssignedResources(getContainerId(1), ResourceInformation.GPU_URI, - Arrays.asList("0", "1", "3")); + Arrays.<Serializable>asList("0", "1", "3")); Assert.assertEquals(3, container.getResourceMappings() .getAssignedResources(ResourceInformation.GPU_URI).size()); @@ -302,7 +303,7 @@ public class TestGpuResourceHandler { ResourceMappings rmap = new ResourceMappings(); ResourceMappings.AssignedResources ar = new ResourceMappings.AssignedResources(); - ar.updateAssignedResources(Arrays.asList("1", "3")); + ar.updateAssignedResources(Arrays.<Serializable>asList("1", "3")); rmap.addAssignedResources(ResourceInformation.GPU_URI, ar); when(nmContainer.getResourceMappings()).thenReturn(rmap); @@ -325,7 +326,7 @@ public class TestGpuResourceHandler { rmap = new ResourceMappings(); ar = new ResourceMappings.AssignedResources(); // id=5 is not in allowed list. - ar.updateAssignedResources(Arrays.asList("4", "5")); + ar.updateAssignedResources(Arrays.<Serializable>asList("4", "5")); rmap.addAssignedResources(ResourceInformation.GPU_URI, ar); when(nmContainer.getResourceMappings()).thenReturn(rmap); @@ -355,7 +356,7 @@ public class TestGpuResourceHandler { rmap = new ResourceMappings(); ar = new ResourceMappings.AssignedResources(); // id=3 is already assigned - ar.updateAssignedResources(Arrays.asList("4", "3")); + ar.updateAssignedResources(Arrays.<Serializable>asList("4", "3")); rmap.addAssignedResources("gpu", ar); when(nmContainer.getResourceMappings()).thenReturn(rmap); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
