Skip to content
Snippets Groups Projects
  • Marcelo Vanzin's avatar
    700312e1
    [SPARK-6324] [CORE] Centralize handling of script usage messages. · 700312e1
    Marcelo Vanzin authored
    Reorganize code so that the launcher library handles most of the work
    of printing usage messages, instead of having an awkward protocol between
    the library and the scripts for that.
    
    This mostly applies to SparkSubmit, since the launcher lib does not do
    command line parsing for classes invoked in other ways, and thus cannot
    handle failures for those. Most scripts end up going through SparkSubmit,
    though, so it all works.
    
    The change adds a new, internal command line switch, "--usage-error",
    which prints the usage message and exits with a non-zero status. Scripts
    can override the command printed in the usage message by setting an
    environment variable - this avoids having to grep the output of
    SparkSubmit to remove references to the "spark-submit" script.
    
    The only sub-optimal part of the change is the special handling for the
    spark-sql usage, which is now done in SparkSubmitArguments.
    
    Author: Marcelo Vanzin <vanzin@cloudera.com>
    
    Closes #5841 from vanzin/SPARK-6324 and squashes the following commits:
    
    2821481 [Marcelo Vanzin] Merge branch 'master' into SPARK-6324
    bf139b5 [Marcelo Vanzin] Filter output of Spark SQL CLI help.
    c6609bf [Marcelo Vanzin] Fix exit code never being used when printing usage messages.
    6bc1b41 [Marcelo Vanzin] [SPARK-6324] [core] Centralize handling of script usage messages.
    700312e1
    History
    [SPARK-6324] [CORE] Centralize handling of script usage messages.
    Marcelo Vanzin authored
    Reorganize code so that the launcher library handles most of the work
    of printing usage messages, instead of having an awkward protocol between
    the library and the scripts for that.
    
    This mostly applies to SparkSubmit, since the launcher lib does not do
    command line parsing for classes invoked in other ways, and thus cannot
    handle failures for those. Most scripts end up going through SparkSubmit,
    though, so it all works.
    
    The change adds a new, internal command line switch, "--usage-error",
    which prints the usage message and exits with a non-zero status. Scripts
    can override the command printed in the usage message by setting an
    environment variable - this avoids having to grep the output of
    SparkSubmit to remove references to the "spark-submit" script.
    
    The only sub-optimal part of the change is the special handling for the
    spark-sql usage, which is now done in SparkSubmitArguments.
    
    Author: Marcelo Vanzin <vanzin@cloudera.com>
    
    Closes #5841 from vanzin/SPARK-6324 and squashes the following commits:
    
    2821481 [Marcelo Vanzin] Merge branch 'master' into SPARK-6324
    bf139b5 [Marcelo Vanzin] Filter output of Spark SQL CLI help.
    c6609bf [Marcelo Vanzin] Fix exit code never being used when printing usage messages.
    6bc1b41 [Marcelo Vanzin] [SPARK-6324] [core] Centralize handling of script usage messages.