This is an automated email from the ASF dual-hosted git repository.
suvasude pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-gobblin.git
The following commit(s) were added to refs/heads/master by this push:
new 60e3ab5 [GOBBLIN-937] fix help text and align it with variable names
60e3ab5 is described below
commit 60e3ab56a6a5bd1fd7c7c31586d6739581fe354f
Author: Jay Sen <[email protected]>
AuthorDate: Thu Oct 31 16:33:12 2019 -0700
[GOBBLIN-937] fix help text and align it with variable names
Closes #2786 from jhsenjaliya/GOBBLIN-937
---
bin/gobblin.sh | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/bin/gobblin.sh b/bin/gobblin.sh
index d82f75b..8e90683 100755
--- a/bin/gobblin.sh
+++ b/bin/gobblin.sh
@@ -35,13 +35,13 @@ GOBBLIN_CONF=''
#sourcing basic gobblin env vars like GOBBLIN_HOME and GOBBLIN_LIB
. ${GOBBLIN_BIN}/gobblin-env.sh
-CLUSTER_NAME="gobblin_cluster"
-JVM_OPTS="-Xmx1g -Xms512m"
+CLUSTER_NAME='gobblin_cluster'
+JVM_OPTS='-Xmx1g -Xms512m'
+USER_JVM_FLAGS=''
LOG4J_FILE_PATH=''
LOG4J_OPTS=''
GOBBLIN_MODE=''
ACTION=''
-JVM_FLAGS=''
EXTRA_JARS=''
VERBOSE=0
ENABLE_GC_LOGS=0
@@ -88,7 +88,7 @@ function print_gobblin_usage() {
}
function print_gobblin_cli_usage() {
- echo "Usage:"
+ echo "Usage: (for Gobblin Version: $GOBBLIN_VERSION)"
echo "gobblin.sh cli <cli-command> <params>"
echo ""
echo "options:"
@@ -106,27 +106,26 @@ function print_gobblin_cli_usage() {
job-store-schema-manager Database job history store schema
manager
gobblin-classpath shows the constructed gobblin
classpath"
echo ""
- echo " --conf-dir <gobblin-conf-dir-path> Gobblon config path.
default is '\$GOBBLIN_HOME/conf/<exe-mode-name>'."
- echo " --log4j-conf <path-of-log4j-file> default is
'<gobblin-conf-dir-path>/<execution-mode>/log4j.properties'."
- echo " --jvmopts <jvm or gc options> String containing JVM
flags to include, in addition to \"$JVM_OPTS\"."
+ echo " --conf-dir <gobblin-conf-dir-path> Gobblon config path.
default is '\$GOBBLIN_HOME/conf/cli'."
+ echo " --log4j-conf <path-of-log4j-file> default is
'<gobblin-conf-dir-path>/cli/log4j.properties'."
+ echo " --jvmopts <jvm or gc options> JVM or GC parameters for
the java process to append to the default params: \"$JVM_OPTS\"."
echo " --jars <csv list of extra jars> Column-separated list of
extra jars to put on the CLASSPATH."
echo " --enable-gc-logs enables gc logs & dumps."
echo " --show-classpath prints gobblin runtime
classpath."
echo " --help Display this help."
echo " --verbose Display full command used
to start the process."
- echo " Gobblin Version:
$GOBBLIN_VERSION"
}
function print_gobblin_service_usage() {
- echo "Usage:"
- echo "gobblin.sh service <execution-mode> <start|stop|status>"
+ echo "Usage: (for Gobblin Version: $GOBBLIN_VERSION)"
+ echo "gobblin.sh service <execution-mode> <start|stop|restart|status>"
echo ""
echo "Argument Options:"
echo " <execution-mode> $GOBBLIN_EXEC_MODE_LIST."
echo ""
- echo " --conf-dir <gobblin-conf-dir-path> Gobblin config path.
default is '\$GOBBLIN_HOME/conf/<exe-mode-name>'."
+ echo " --conf-dir <gobblin-conf-dir-path> Gobblin config path.
default is '\$GOBBLIN_HOME/conf/<execution-mode>'."
echo " --log4j-conf <path-of-log4j-file> default is
'<gobblin-conf-dir-path>/<execution-mode>/log4j.properties'."
- echo " --jvmopts <jvm or gc options> String containing JVM
flags to include, in addition to \"$JVM_OPTS\"."
+ echo " --jvmopts <jvm or gc options> JVM or GC parameters for
the java process to append to the default params: \"$JVM_OPTS\"."
echo " --jars <csv list of extra jars> Column-separated list of
extra jars to put on the CLASSPATH."
echo " --enable-gc-logs enables gc logs & dumps."
echo " --show-classpath prints gobblin runtime
classpath."
@@ -137,7 +136,6 @@ function print_gobblin_service_usage() {
echo " --log-to-stdout Outputs to stdout rather
than to a log file"
echo " --help Display this help."
echo " --verbose Display full command used
to start the process."
- echo " Gobblin Version:
$GOBBLIN_VERSION"
}
function print_help_n_exit() {
@@ -182,8 +180,8 @@ do
GOBBLIN_MODE_TYPE=$CLI
GOBBLIN_MODE=$CLASSPATH_CMD
;;
- --jvmflags)
- JVM_FLAGS="$2"
+ --jvmopts)
+ USER_JVM_FLAGS="$2"
shift
;;
--conf-dir)
@@ -254,8 +252,8 @@ PID_FILE="$GOBBLIN_HOME/$PID_FILE_NAME"
# JVM Flags
-if [[ -n "$JVM_FLAGS" ]]; then
- JVM_OPTS="$JVM_OPTS $JVM_FLAGS"
+if [[ -n "$USER_JVM_FLAGS" ]]; then
+ JVM_OPTS="$JVM_OPTS $USER_JVM_FLAGS"
fi
# gobblin config
