forked from apache/flink
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FLINK-11779] Update the description of the CLI -m parameter
We now document that the CLI ignores -m parameter if high-availability is ZOOKEEPER 1. Change the description message of -m parameter of `DefaultCLI` and `FlinkYarnSessionCli`. 2. Change the description message of "rest.address.port"
- Loading branch information
Showing
6 changed files
with
105 additions
and
81 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
68 changes: 68 additions & 0 deletions
68
flink-yarn/src/main/java/org/apache/flink/yarn/cli/AbstractYarnCli.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,68 @@ | ||
| /* | ||
| * 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.cli; | ||
|
|
||
| import org.apache.flink.client.cli.AbstractCustomCommandLine; | ||
| import org.apache.flink.configuration.Configuration; | ||
| import org.apache.flink.configuration.DeploymentOptions; | ||
| import org.apache.flink.yarn.configuration.YarnConfigOptions; | ||
| import org.apache.flink.yarn.executors.YarnJobClusterExecutor; | ||
| import org.apache.flink.yarn.executors.YarnSessionClusterExecutor; | ||
|
|
||
| import org.apache.commons.cli.CommandLine; | ||
| import org.apache.commons.cli.Option; | ||
| import org.apache.commons.cli.Options; | ||
|
|
||
| abstract class AbstractYarnCli extends AbstractCustomCommandLine { | ||
|
|
||
| public static final String ID = "yarn-cluster"; | ||
|
|
||
| protected Option applicationId = | ||
| new Option("yid", "yarnapplicationId", true, "Attach to running YARN session"); | ||
|
|
||
| protected Option addressOption = | ||
| new Option("m", "jobmanager", true, "Set to " + ID + " to use YARN execution mode."); | ||
|
|
||
| protected AbstractYarnCli(Configuration configuration) { | ||
| super(configuration); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isActive(CommandLine commandLine) { | ||
| final String jobManagerOption = commandLine.getOptionValue(addressOption.getOpt(), null); | ||
| final boolean yarnJobManager = ID.equals(jobManagerOption); | ||
| final boolean hasYarnAppId = commandLine.hasOption(applicationId.getOpt()) | ||
| || configuration.getOptional(YarnConfigOptions.APPLICATION_ID).isPresent(); | ||
| final boolean hasYarnExecutor = YarnSessionClusterExecutor.NAME.equalsIgnoreCase(configuration.get(DeploymentOptions.TARGET)) | ||
| || YarnJobClusterExecutor.NAME.equalsIgnoreCase(configuration.get(DeploymentOptions.TARGET)); | ||
| return hasYarnExecutor || yarnJobManager || hasYarnAppId; | ||
| } | ||
|
|
||
| @Override | ||
| public void addGeneralOptions(Options baseOptions) { | ||
| super.addGeneralOptions(baseOptions); | ||
| baseOptions.addOption(applicationId); | ||
| baseOptions.addOption(addressOption); | ||
| } | ||
|
|
||
| @Override | ||
| public String getId() { | ||
| return ID; | ||
| } | ||
| } |
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