KarmaGYZ commented on a change in pull request #18087: URL: https://github.com/apache/flink/pull/18087#discussion_r772045629
########## File path: flink-yarn/src/test/java/org/apache/flink/yarn/ContainerRequestReflectorTest.java ########## @@ -0,0 +1,171 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.yarn; + +import org.apache.flink.runtime.util.HadoopUtils; +import org.apache.flink.util.TestLogger; + +import org.apache.hadoop.yarn.api.records.Priority; +import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.client.api.AMRMClient; +import org.junit.Test; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeTrue; + +/** Tests for {@link ContainerRequestReflector}. */ +public class ContainerRequestReflectorTest extends TestLogger { + + @Test + public void testGetContainerRequestIfConstructorPresent() { + final ContainerRequestReflector containerRequestReflector = + new ContainerRequestReflector(ContainerRequestWithConstructor.class); + Resource resource = Resource.newInstance(100, 1); + Priority priority = Priority.newInstance(1); + + AMRMClient.ContainerRequest containerRequest = + containerRequestReflector.getContainerRequest(resource, priority, "GPU"); + assertTrue(containerRequest instanceof ContainerRequestWithConstructor); + ContainerRequestWithConstructor containerRequestWithConstructor = + (ContainerRequestWithConstructor) containerRequest; + assertEquals("GPU", containerRequestWithConstructor.getNodeLabelsExpression()); + + containerRequest = containerRequestReflector.getContainerRequest(resource, priority, null); + assertTrue(containerRequest instanceof AMRMClient.ContainerRequest); + assertFalse(containerRequest instanceof ContainerRequestWithConstructor); + + containerRequest = containerRequestReflector.getContainerRequest(resource, priority, ""); + assertTrue(containerRequest instanceof AMRMClient.ContainerRequest); + assertFalse(containerRequest instanceof ContainerRequestWithConstructor); + } + + @Test + public void testGetContainerRequestIfConstructorAbsent() { + final ContainerRequestReflector containerRequestReflector = + new ContainerRequestReflector(ContainerRequestWithoutConstructor.class); + Resource resource = Resource.newInstance(100, 1); + Priority priority = Priority.newInstance(1); + + AMRMClient.ContainerRequest containerRequest = + containerRequestReflector.getContainerRequest(resource, priority, "GPU"); + assertTrue(containerRequest instanceof AMRMClient.ContainerRequest); + assertFalse(containerRequest instanceof ContainerRequestWithConstructor); Review comment: ```suggestion assertFalse(containerRequest instanceof ContainerRequestWithoutConstructor); ``` ########## File path: flink-yarn/src/test/java/org/apache/flink/yarn/ContainerRequestReflectorTest.java ########## @@ -0,0 +1,173 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.yarn; + +import org.apache.flink.runtime.util.HadoopUtils; +import org.apache.flink.util.TestLogger; + +import org.apache.hadoop.yarn.api.records.Priority; +import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.client.api.AMRMClient; +import org.junit.Test; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeTrue; + +/** Tests for {@link ContainerRequestReflector}. */ +public class ContainerRequestReflectorTest extends TestLogger { + + @Test + public void testGetContainerRequestIfConstructorPresent() { + final ContainerRequestReflector containerRequestReflector = + new ContainerRequestReflector(ContainerRequestWithConstructor.class); + Resource resource = Resource.newInstance(100, 1); + Priority priority = Priority.newInstance(1); + + AMRMClient.ContainerRequest containerRequest = + containerRequestReflector.getContainerRequest(resource, priority, "GPU"); + assertTrue(containerRequest instanceof ContainerRequestWithConstructor); Review comment: Ok. But `assertTrue(containerRequest instanceof AMRMClient.ContainerRequest);` is invalid and should be removed. Same as below. ########## File path: flink-yarn/src/test/java/org/apache/flink/yarn/ContainerRequestReflectorTest.java ########## @@ -0,0 +1,171 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.yarn; + +import org.apache.flink.runtime.util.HadoopUtils; +import org.apache.flink.util.TestLogger; + +import org.apache.hadoop.yarn.api.records.Priority; +import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.client.api.AMRMClient; +import org.junit.Test; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeTrue; + +/** Tests for {@link ContainerRequestReflector}. */ +public class ContainerRequestReflectorTest extends TestLogger { + + @Test + public void testGetContainerRequestIfConstructorPresent() { + final ContainerRequestReflector containerRequestReflector = + new ContainerRequestReflector(ContainerRequestWithConstructor.class); + Resource resource = Resource.newInstance(100, 1); + Priority priority = Priority.newInstance(1); + + AMRMClient.ContainerRequest containerRequest = + containerRequestReflector.getContainerRequest(resource, priority, "GPU"); + assertTrue(containerRequest instanceof ContainerRequestWithConstructor); + ContainerRequestWithConstructor containerRequestWithConstructor = + (ContainerRequestWithConstructor) containerRequest; + assertEquals("GPU", containerRequestWithConstructor.getNodeLabelsExpression()); + + containerRequest = containerRequestReflector.getContainerRequest(resource, priority, null); + assertTrue(containerRequest instanceof AMRMClient.ContainerRequest); + assertFalse(containerRequest instanceof ContainerRequestWithConstructor); + + containerRequest = containerRequestReflector.getContainerRequest(resource, priority, ""); + assertTrue(containerRequest instanceof AMRMClient.ContainerRequest); + assertFalse(containerRequest instanceof ContainerRequestWithConstructor); + } + + @Test + public void testGetContainerRequestIfConstructorAbsent() { + final ContainerRequestReflector containerRequestReflector = + new ContainerRequestReflector(ContainerRequestWithoutConstructor.class); + Resource resource = Resource.newInstance(100, 1); + Priority priority = Priority.newInstance(1); + + AMRMClient.ContainerRequest containerRequest = + containerRequestReflector.getContainerRequest(resource, priority, "GPU"); + assertTrue(containerRequest instanceof AMRMClient.ContainerRequest); + assertFalse(containerRequest instanceof ContainerRequestWithConstructor); + + containerRequest = containerRequestReflector.getContainerRequest(resource, priority, null); + assertTrue(containerRequest instanceof AMRMClient.ContainerRequest); + assertFalse(containerRequest instanceof ContainerRequestWithConstructor); + + containerRequest = containerRequestReflector.getContainerRequest(resource, priority, ""); + assertTrue(containerRequest instanceof AMRMClient.ContainerRequest); + assertFalse(containerRequest instanceof ContainerRequestWithConstructor); Review comment: ```suggestion assertFalse(containerRequest instanceof ContainerRequestWithoutConstructor); ``` ########## File path: flink-yarn/src/test/java/org/apache/flink/yarn/ContainerRequestReflectorTest.java ########## @@ -0,0 +1,171 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.yarn; + +import org.apache.flink.runtime.util.HadoopUtils; +import org.apache.flink.util.TestLogger; + +import org.apache.hadoop.yarn.api.records.Priority; +import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.client.api.AMRMClient; +import org.junit.Test; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeTrue; + +/** Tests for {@link ContainerRequestReflector}. */ +public class ContainerRequestReflectorTest extends TestLogger { + + @Test + public void testGetContainerRequestIfConstructorPresent() { + final ContainerRequestReflector containerRequestReflector = + new ContainerRequestReflector(ContainerRequestWithConstructor.class); + Resource resource = Resource.newInstance(100, 1); + Priority priority = Priority.newInstance(1); + + AMRMClient.ContainerRequest containerRequest = + containerRequestReflector.getContainerRequest(resource, priority, "GPU"); + assertTrue(containerRequest instanceof ContainerRequestWithConstructor); + ContainerRequestWithConstructor containerRequestWithConstructor = + (ContainerRequestWithConstructor) containerRequest; + assertEquals("GPU", containerRequestWithConstructor.getNodeLabelsExpression()); + + containerRequest = containerRequestReflector.getContainerRequest(resource, priority, null); + assertTrue(containerRequest instanceof AMRMClient.ContainerRequest); + assertFalse(containerRequest instanceof ContainerRequestWithConstructor); + + containerRequest = containerRequestReflector.getContainerRequest(resource, priority, ""); + assertTrue(containerRequest instanceof AMRMClient.ContainerRequest); + assertFalse(containerRequest instanceof ContainerRequestWithConstructor); + } + + @Test + public void testGetContainerRequestIfConstructorAbsent() { + final ContainerRequestReflector containerRequestReflector = + new ContainerRequestReflector(ContainerRequestWithoutConstructor.class); + Resource resource = Resource.newInstance(100, 1); + Priority priority = Priority.newInstance(1); + + AMRMClient.ContainerRequest containerRequest = + containerRequestReflector.getContainerRequest(resource, priority, "GPU"); + assertTrue(containerRequest instanceof AMRMClient.ContainerRequest); + assertFalse(containerRequest instanceof ContainerRequestWithConstructor); + + containerRequest = containerRequestReflector.getContainerRequest(resource, priority, null); + assertTrue(containerRequest instanceof AMRMClient.ContainerRequest); + assertFalse(containerRequest instanceof ContainerRequestWithConstructor); + + containerRequest = containerRequestReflector.getContainerRequest(resource, priority, ""); + assertTrue(containerRequest instanceof AMRMClient.ContainerRequest); + assertFalse(containerRequest instanceof ContainerRequestWithConstructor); + } + + @Test + public void testGetContainerRequestWithoutYarnSupport() { Review comment: I think we cannot verify anything in this test. So, just creating three `ContainerRequest` without any exception would be good. ########## File path: flink-yarn/src/test/java/org/apache/flink/yarn/ContainerRequestReflectorTest.java ########## @@ -0,0 +1,171 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.yarn; + +import org.apache.flink.runtime.util.HadoopUtils; +import org.apache.flink.util.TestLogger; + +import org.apache.hadoop.yarn.api.records.Priority; +import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.client.api.AMRMClient; +import org.junit.Test; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeTrue; + +/** Tests for {@link ContainerRequestReflector}. */ +public class ContainerRequestReflectorTest extends TestLogger { + + @Test + public void testGetContainerRequestIfConstructorPresent() { + final ContainerRequestReflector containerRequestReflector = + new ContainerRequestReflector(ContainerRequestWithConstructor.class); + Resource resource = Resource.newInstance(100, 1); + Priority priority = Priority.newInstance(1); + + AMRMClient.ContainerRequest containerRequest = + containerRequestReflector.getContainerRequest(resource, priority, "GPU"); + assertTrue(containerRequest instanceof ContainerRequestWithConstructor); + ContainerRequestWithConstructor containerRequestWithConstructor = + (ContainerRequestWithConstructor) containerRequest; + assertEquals("GPU", containerRequestWithConstructor.getNodeLabelsExpression()); + + containerRequest = containerRequestReflector.getContainerRequest(resource, priority, null); + assertTrue(containerRequest instanceof AMRMClient.ContainerRequest); + assertFalse(containerRequest instanceof ContainerRequestWithConstructor); + + containerRequest = containerRequestReflector.getContainerRequest(resource, priority, ""); + assertTrue(containerRequest instanceof AMRMClient.ContainerRequest); + assertFalse(containerRequest instanceof ContainerRequestWithConstructor); + } + + @Test + public void testGetContainerRequestIfConstructorAbsent() { + final ContainerRequestReflector containerRequestReflector = + new ContainerRequestReflector(ContainerRequestWithoutConstructor.class); + Resource resource = Resource.newInstance(100, 1); + Priority priority = Priority.newInstance(1); + + AMRMClient.ContainerRequest containerRequest = + containerRequestReflector.getContainerRequest(resource, priority, "GPU"); + assertTrue(containerRequest instanceof AMRMClient.ContainerRequest); + assertFalse(containerRequest instanceof ContainerRequestWithConstructor); + + containerRequest = containerRequestReflector.getContainerRequest(resource, priority, null); + assertTrue(containerRequest instanceof AMRMClient.ContainerRequest); + assertFalse(containerRequest instanceof ContainerRequestWithConstructor); Review comment: ```suggestion assertFalse(containerRequest instanceof ContainerRequestWithoutConstructor); ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
