forked from apache/flink
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FLINK-8872][flip6] fix yarn detached mode command parsing
The detached flag if given by "-yd" was not passed correctly into the CliFrontend and resulted in the CLI waiting for submitted jobs to finish instead of detaching from the execution. [FLINK-8872][yarn] add tests for YARN detached mode command line parsing with CliFrontend - create a test-jar of flink-clients - create CliFrontendRunWithYarnTest based on CliFrontendRunTest that verifies CliFrontend's parsing in conjunction with FlinkYarnSessionCli -> verify detached mode in this test (can be extended further in the future) This closes apache#5672.
- Loading branch information
1 parent
ca5573b
commit fdd1c6e
Showing
13 changed files
with
392 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
148 changes: 148 additions & 0 deletions
148
flink-yarn-tests/src/test/java/org/apache/flink/yarn/CliFrontendRunWithYarnTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| /* | ||
| * 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:https://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.client.cli.CliFrontendTestBase; | ||
| import org.apache.flink.client.cli.CliFrontendTestUtils; | ||
| import org.apache.flink.client.deployment.ClusterSpecification; | ||
| import org.apache.flink.client.program.ClusterClient; | ||
| import org.apache.flink.configuration.Configuration; | ||
| import org.apache.flink.configuration.CoreOptions; | ||
| import org.apache.flink.configuration.JobManagerOptions; | ||
| import org.apache.flink.runtime.jobgraph.JobGraph; | ||
| import org.apache.flink.util.FlinkException; | ||
| import org.apache.flink.yarn.cli.FlinkYarnSessionCli; | ||
| import org.apache.flink.yarn.util.FakeClusterClient; | ||
| import org.apache.flink.yarn.util.NonDeployingYarnClusterDescriptor; | ||
|
|
||
| import org.apache.commons.cli.CommandLine; | ||
| import org.apache.hadoop.yarn.api.records.ApplicationId; | ||
| import org.apache.hadoop.yarn.client.api.YarnClient; | ||
| import org.apache.hadoop.yarn.conf.YarnConfiguration; | ||
| import org.junit.AfterClass; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.rules.TemporaryFolder; | ||
| import org.junit.runner.RunWith; | ||
| import org.junit.runners.Parameterized; | ||
|
|
||
| import static junit.framework.TestCase.assertTrue; | ||
| import static org.apache.flink.client.cli.CliFrontendRunTest.verifyCliFrontend; | ||
| import static org.apache.flink.yarn.util.YarnTestUtils.getTestJarPath; | ||
|
|
||
| /** | ||
| * Tests for the RUN command using a {@link org.apache.flink.yarn.cli.FlinkYarnSessionCli} inside | ||
| * the {@link org.apache.flink.client.cli.CliFrontend}. | ||
| * | ||
| * @see org.apache.flink.client.cli.CliFrontendRunTest | ||
| */ | ||
| @RunWith(Parameterized.class) | ||
| public class CliFrontendRunWithYarnTest extends CliFrontendTestBase { | ||
|
|
||
| @Rule | ||
| public TemporaryFolder tmp = new TemporaryFolder(); | ||
|
|
||
| @BeforeClass | ||
| public static void init() { | ||
| CliFrontendTestUtils.pipeSystemOutToNull(); | ||
| } | ||
|
|
||
| @AfterClass | ||
| public static void shutdown() { | ||
| CliFrontendTestUtils.restoreSystemOut(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testRun() throws Exception { | ||
| String testJarPath = getTestJarPath("BatchWordCount.jar").getAbsolutePath(); | ||
|
|
||
| Configuration configuration = new Configuration(); | ||
| configuration.setString(CoreOptions.MODE, mode); | ||
| configuration.setString(JobManagerOptions.ADDRESS, "localhost"); | ||
| configuration.setInteger(JobManagerOptions.PORT, 8081); | ||
|
|
||
| FlinkYarnSessionCli yarnCLI = new TestingFlinkYarnSessionCli( | ||
| configuration, | ||
| tmp.getRoot().getAbsolutePath(), | ||
| "y", | ||
| "yarn"); | ||
|
|
||
| // test detached mode | ||
| { | ||
| String[] parameters = {"-m", "yarn-cluster", "-yn", "1", "-p", "2", "-d", testJarPath}; | ||
| verifyCliFrontend(yarnCLI, parameters, 2, true, true); | ||
| } | ||
|
|
||
| // test detached mode | ||
| { | ||
| String[] parameters = {"-m", "yarn-cluster", "-yn", "1", "-p", "2", "-yd", testJarPath}; | ||
| verifyCliFrontend(yarnCLI, parameters, 2, true, true); | ||
| } | ||
| } | ||
|
|
||
| private static class TestingFlinkYarnSessionCli extends FlinkYarnSessionCli { | ||
| @SuppressWarnings("unchecked") | ||
| private final ClusterClient<ApplicationId> clusterClient; | ||
| private final String configurationDirectory; | ||
|
|
||
| private TestingFlinkYarnSessionCli( | ||
| Configuration configuration, | ||
| String configurationDirectory, | ||
| String shortPrefix, | ||
| String longPrefix) throws Exception { | ||
| super(configuration, configurationDirectory, shortPrefix, longPrefix); | ||
|
|
||
| this.clusterClient = new FakeClusterClient(configuration); | ||
| this.configurationDirectory = configurationDirectory; | ||
| } | ||
|
|
||
| @Override | ||
| public AbstractYarnClusterDescriptor createClusterDescriptor(CommandLine commandLine) | ||
| throws FlinkException { | ||
| AbstractYarnClusterDescriptor parent = super.createClusterDescriptor(commandLine); | ||
| return new NonDeployingDetachedYarnClusterDescriptor( | ||
| parent.getFlinkConfiguration(), | ||
| (YarnConfiguration) parent.getYarnClient().getConfig(), | ||
| configurationDirectory, | ||
| parent.getYarnClient(), | ||
| clusterClient); | ||
| } | ||
| } | ||
|
|
||
| private static class NonDeployingDetachedYarnClusterDescriptor extends NonDeployingYarnClusterDescriptor { | ||
|
|
||
| NonDeployingDetachedYarnClusterDescriptor( | ||
| Configuration flinkConfiguration, | ||
| YarnConfiguration yarnConfiguration, String configurationDirectory, | ||
| YarnClient yarnClient, | ||
| ClusterClient<ApplicationId> clusterClient) { | ||
| super(flinkConfiguration, yarnConfiguration, configurationDirectory, yarnClient, | ||
| clusterClient); | ||
| } | ||
|
|
||
| @Override | ||
| public ClusterClient<ApplicationId> deployJobCluster( | ||
| ClusterSpecification clusterSpecification, JobGraph jobGraph, boolean detached) { | ||
| assertTrue(detached); | ||
| return super.deployJobCluster(clusterSpecification, jobGraph, true); | ||
| } | ||
| } | ||
|
|
||
| } |
79 changes: 79 additions & 0 deletions
79
flink-yarn-tests/src/test/java/org/apache/flink/yarn/util/FakeClusterClient.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * 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:https://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.util; | ||
|
|
||
| import org.apache.flink.api.common.JobSubmissionResult; | ||
| import org.apache.flink.client.program.ClusterClient; | ||
| import org.apache.flink.configuration.Configuration; | ||
| import org.apache.flink.runtime.clusterframework.messages.GetClusterStatusResponse; | ||
| import org.apache.flink.runtime.jobgraph.JobGraph; | ||
|
|
||
| import org.apache.hadoop.yarn.api.records.ApplicationId; | ||
|
|
||
| import java.net.URL; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Dummy {@link ClusterClient} for testing purposes (extend as needed). | ||
| */ | ||
| public class FakeClusterClient extends ClusterClient<ApplicationId> { | ||
|
|
||
| public FakeClusterClient(Configuration flinkConfig) throws Exception { | ||
| super(flinkConfig); | ||
| } | ||
|
|
||
| @Override | ||
| public void waitForClusterToBeReady() { | ||
| } | ||
|
|
||
| @Override | ||
| public String getWebInterfaceURL() { | ||
| return ""; | ||
| } | ||
|
|
||
| @Override | ||
| public GetClusterStatusResponse getClusterStatus() { | ||
| throw new UnsupportedOperationException("Not needed in test."); | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> getNewMessages() { | ||
| throw new UnsupportedOperationException("Not needed in test."); | ||
| } | ||
|
|
||
| @Override | ||
| public ApplicationId getClusterId() { | ||
| throw new UnsupportedOperationException("Not needed in test."); | ||
| } | ||
|
|
||
| @Override | ||
| public int getMaxSlots() { | ||
| return 10; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasUserJarsInClassPath(List<URL> userJarFiles) { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public JobSubmissionResult submitJob(JobGraph jobGraph, ClassLoader classLoader) { | ||
| throw new UnsupportedOperationException("Not needed in test."); | ||
| } | ||
| } |
Oops, something went wrong.