[flink] 03/05: [hotfix] Improve StandaloneJobClusterEntrypoint command line help

[trohrmann]

This is an automated email from the ASF dual-hosted git repository.

trohrmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git

commit fa3fba5cd3ab0acaed2537090e549e7ab70d8613
Author: Till Rohrmann <trohrm...@apache.org>
AuthorDate: Thu Aug 16 19:33:21 2018 +0200

    [hotfix] Improve StandaloneJobClusterEntrypoint command line help
    
    Properly print the CLI help if the command line options could not be parsed.
---
 .../flink/container/entrypoint/StandaloneJobClusterEntryPoint.java  | 2 +-
 .../runtime/entrypoint/StandaloneSessionClusterEntrypoint.java      | 2 +-
 .../apache/flink/runtime/entrypoint/parser/CommandLineParser.java   | 6 ++++--
 .../org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java    | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git 
a/flink-container/src/main/java/org/apache/flink/container/entrypoint/StandaloneJobClusterEntryPoint.java
 
b/flink-container/src/main/java/org/apache/flink/container/entrypoint/StandaloneJobClusterEntryPoint.java
index 8ff79ef..b60b078 100644
--- 
a/flink-container/src/main/java/org/apache/flink/container/entrypoint/StandaloneJobClusterEntryPoint.java
+++ 
b/flink-container/src/main/java/org/apache/flink/container/entrypoint/StandaloneJobClusterEntryPoint.java
@@ -150,7 +150,7 @@ public final class StandaloneJobClusterEntryPoint extends 
JobClusterEntrypoint {
                        clusterConfiguration = commandLineParser.parse(args);
                } catch (FlinkParseException e) {
                        LOG.error("Could not parse command line arguments {}.", 
args, e);
-                       commandLineParser.printHelp();
+                       
commandLineParser.printHelp(StandaloneJobClusterEntryPoint.class.getSimpleName());
                        System.exit(1);
                }
 
diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/StandaloneSessionClusterEntrypoint.java
 
b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/StandaloneSessionClusterEntrypoint.java
index 9943936..edff87b 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/StandaloneSessionClusterEntrypoint.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/StandaloneSessionClusterEntrypoint.java
@@ -89,7 +89,7 @@ public class StandaloneSessionClusterEntrypoint extends 
SessionClusterEntrypoint
                        entrypointClusterConfiguration = 
commandLineParser.parse(args);
                } catch (FlinkParseException e) {
                        LOG.error("Could not parse command line arguments {}.", 
args, e);
-                       commandLineParser.printHelp();
+                       
commandLineParser.printHelp(StandaloneSessionClusterEntrypoint.class.getSimpleName());
                        System.exit(1);
                }
 
diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/parser/CommandLineParser.java
 
b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/parser/CommandLineParser.java
index f9e199c..1c07fb7 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/parser/CommandLineParser.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/entrypoint/parser/CommandLineParser.java
@@ -55,8 +55,10 @@ public class CommandLineParser<T> {
                return parserResultFactory.createResult(commandLine);
        }
 
-       public void printHelp() {
+       public void printHelp(@Nonnull String cmdLineSyntax) {
                final HelpFormatter helpFormatter = new HelpFormatter();
-               helpFormatter.printHelp("", parserResultFactory.getOptions());
+               helpFormatter.setLeftPadding(5);
+               helpFormatter.setWidth(80);
+               helpFormatter.printHelp(cmdLineSyntax, 
parserResultFactory.getOptions(), true);
        }
 }
diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java
 
b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java
index 9ab7f80..afe22de 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskManagerRunner.java
@@ -315,7 +315,7 @@ public class TaskManagerRunner implements 
FatalErrorHandler, AutoCloseableAsync
                        clusterConfiguration = commandLineParser.parse(args);
                } catch (FlinkParseException e) {
                        LOG.error("Could not parse the command line options.", 
e);
-                       commandLineParser.printHelp();
+                       
commandLineParser.printHelp(TaskManagerRunner.class.getSimpleName());
                        throw e;
                }