Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FLINK-8348] [flip6] Print help for DefaultCLI #5233

Closed
wants to merge 7 commits into from
Closed

[FLINK-8348] [flip6] Print help for DefaultCLI #5233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
08a4788
[FLINK-8340] [flip6] Remove passing of Configuration to CustomCommand…
tillrohrmann Jan 3, 2018
20bf4f1
[FLINK-8341] [flip6] Remove not needed options from CommandLineOptions
tillrohrmann Dec 20, 2017
142c170
[FLINK-8342] [flip6] Remove generic type parameter from ClusterDescri…
tillrohrmann Jan 2, 2018
59381f6
[FLINK-8349] [flip6] Remove Yarn specific commands from YarnClusterDe…
tillrohrmann Jan 11, 2018
fda1948
[hotfix] Add help command to FlinkYarnSessionCli
tillrohrmann Dec 29, 2017
ac34a61
[FLINK-8347] [flip6] Make cluster id used by ClusterDescriptor typesafe
tillrohrmann Jan 11, 2018
ad69f50
[FLINK-8348] [flip6] Print help for DefaultCLI
tillrohrmann Dec 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion flink-clients/src/main/java/org/apache/flink/client/RemoteExecutor.java
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@ public class RemoteExecutor extends PlanExecutor {

private final Configuration clientConfiguration;

private ClusterClient client;
private ClusterClient<?> client;

private int defaultParallelism = 1;

Expand Down
20 changes: 15 additions & 5 deletions flink-clients/src/main/java/org/apache/flink/client/cli/AbstractCustomCommandLine.java
View file
Open in desktop
Expand Up @@ -19,9 +19,11 @@
package org.apache.flink.client.cli;

import org.apache.flink.client.ClientUtils;
import org.apache.flink.client.program.ClusterClient;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.HighAvailabilityOptions;
import org.apache.flink.configuration.UnmodifiableConfiguration;
import org.apache.flink.util.FlinkException;
import org.apache.flink.util.Preconditions;

import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
Expand All @@ -35,9 +37,8 @@
* Base class for {@link CustomCommandLine} implementations which specify a JobManager address and
* a ZooKeeper namespace.
*
* @param <C> type of the ClusterClient which is returned
*/
public abstract class AbstractCustomCommandLine<C extends ClusterClient> implements CustomCommandLine<C> {
public abstract class AbstractCustomCommandLine<T> implements CustomCommandLine<T> {

protected final Option zookeeperNamespaceOption = new Option("z", "zookeeperNamespace", true,
"Namespace to create the Zookeeper sub-paths for high availability mode");
Expand All @@ -47,6 +48,16 @@ public abstract class AbstractCustomCommandLine<C extends ClusterClient> impleme
"Address of the JobManager (master) to which to connect. " +
"Use this flag to connect to a different JobManager than the one specified in the configuration.");

protected final Configuration configuration;

protected AbstractCustomCommandLine(Configuration configuration) {
this.configuration = new UnmodifiableConfiguration(Preconditions.checkNotNull(configuration));
}

public Configuration getConfiguration() {
return configuration;
}

@Override
public void addRunOptions(Options baseOptions) {
// nothing to add here
Expand All @@ -61,11 +72,10 @@ public void addGeneralOptions(Options baseOptions) {
/**
* Override configuration settings by specified command line options.
*
* @param configuration to use as the base configuration
* @param commandLine containing the overriding values
* @return Effective configuration with the overriden configuration settings
*/
protected Configuration applyCommandLineOptionsToConfiguration(Configuration configuration, CommandLine commandLine) {
protected Configuration applyCommandLineOptionsToConfiguration(CommandLine commandLine) throws FlinkException {
final Configuration resultingConfiguration = new Configuration(configuration);

if (commandLine.hasOption(addressOption.getOpt())) {
Expand Down