This is an automated email from the ASF dual-hosted git repository. pnowojski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit d14117f651b5753e36d777f3ab50dc8559f943bf Author: Piotr Nowojski <[email protected]> AuthorDate: Wed Apr 24 11:43:08 2019 +0200 [hotfix][dist] Rename FLINK_ROOT*_DIR to FLINK_HOME The same concept of Flink's root/home directory was named in different places differently. This commit unifies the naming convention to FLINK_HOME by renaming FLINK_ROOT_DIR and FLINK_HOME_DIR to FLINK_HOME. --- flink-dist/src/main/flink-bin/bin/config.sh | 14 +++++++------- flink-dist/src/main/flink-bin/bin/flink | 2 +- flink-dist/src/main/flink-bin/bin/flink.bat | 4 ++-- .../src/main/flink-bin/bin/pyflink-gateway-server.sh | 4 ++-- flink-dist/src/main/flink-bin/bin/pyflink-stream.sh | 2 +- flink-dist/src/main/flink-bin/bin/pyflink.bat | 4 ++-- flink-dist/src/main/flink-bin/bin/pyflink.sh | 2 +- flink-dist/src/main/flink-bin/bin/start-cluster.bat | 8 ++++---- flink-table/flink-sql-client/bin/sql-client.sh | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/flink-dist/src/main/flink-bin/bin/config.sh b/flink-dist/src/main/flink-bin/bin/config.sh index 1d38e2a..3af82b2 100755 --- a/flink-dist/src/main/flink-bin/bin/config.sh +++ b/flink-dist/src/main/flink-bin/bin/config.sh @@ -296,9 +296,9 @@ bin=`dirname "$target"` SYMLINK_RESOLVED_BIN=`cd "$bin"; pwd -P` # Define the main directory of the flink installation -FLINK_ROOT_DIR=`dirname "$SYMLINK_RESOLVED_BIN"` -FLINK_LIB_DIR=$FLINK_ROOT_DIR/lib -FLINK_OPT_DIR=$FLINK_ROOT_DIR/opt +FLINK_HOME=`dirname "$SYMLINK_RESOLVED_BIN"` +FLINK_LIB_DIR=$FLINK_HOME/lib +FLINK_OPT_DIR=$FLINK_HOME/opt ### Exported environment variables ### export FLINK_CONF_DIR @@ -310,10 +310,10 @@ export FLINK_OPT_DIR # These need to be mangled because they are directly passed to java. # The above lib path is used by the shell script to retrieve jars in a # directory, so it needs to be unmangled. -FLINK_ROOT_DIR_MANGLED=`manglePath "$FLINK_ROOT_DIR"` -if [ -z "$FLINK_CONF_DIR" ]; then FLINK_CONF_DIR=$FLINK_ROOT_DIR_MANGLED/conf; fi -FLINK_BIN_DIR=$FLINK_ROOT_DIR_MANGLED/bin -DEFAULT_FLINK_LOG_DIR=$FLINK_ROOT_DIR_MANGLED/log +FLINK_HOME_DIR_MANGLED=`manglePath "$FLINK_HOME"` +if [ -z "$FLINK_CONF_DIR" ]; then FLINK_CONF_DIR=$FLINK_HOME_DIR_MANGLED/conf; fi +FLINK_BIN_DIR=$FLINK_HOME_DIR_MANGLED/bin +DEFAULT_FLINK_LOG_DIR=$FLINK_HOME_DIR_MANGLED/log FLINK_CONF_FILE="flink-conf.yaml" YAML_CONF=${FLINK_CONF_DIR}/${FLINK_CONF_FILE} diff --git a/flink-dist/src/main/flink-bin/bin/flink b/flink-dist/src/main/flink-bin/bin/flink index d38217d..113d4ec 100644 --- a/flink-dist/src/main/flink-bin/bin/flink +++ b/flink-dist/src/main/flink-bin/bin/flink @@ -48,7 +48,7 @@ CC_CLASSPATH=`constructFlinkClassPath` log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-client-$HOSTNAME.log log_setting=(-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j-cli.properties -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml) -export FLINK_ROOT_DIR +export FLINK_HOME export FLINK_CONF_DIR # Add HADOOP_CLASSPATH to allow the usage of Hadoop file systems diff --git a/flink-dist/src/main/flink-bin/bin/flink.bat b/flink-dist/src/main/flink-bin/bin/flink.bat index 845d791..8ed1fcf 100644 --- a/flink-dist/src/main/flink-bin/bin/flink.bat +++ b/flink-dist/src/main/flink-bin/bin/flink.bat @@ -20,8 +20,8 @@ setlocal SET bin=%~dp0 -SET FLINK_ROOT_DIR=%bin%.. -SET FLINK_LIB_DIR=%FLINK_ROOT_DIR%\lib +SET FLINK_HOME=%bin%.. +SET FLINK_LIB_DIR=%FLINK_HOME%\lib SET JVM_ARGS=-Xmx512m diff --git a/flink-dist/src/main/flink-bin/bin/pyflink-gateway-server.sh b/flink-dist/src/main/flink-bin/bin/pyflink-gateway-server.sh index 5fff644..433c626 100644 --- a/flink-dist/src/main/flink-bin/bin/pyflink-gateway-server.sh +++ b/flink-dist/src/main/flink-bin/bin/pyflink-gateway-server.sh @@ -50,8 +50,8 @@ done log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-python-$HOSTNAME.log log_setting=(-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j-cli.properties -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml) -TABLE_JAR_PATH=`echo "$FLINK_ROOT_DIR"/opt/flink-table*.jar` -PYTHON_JAR_PATH=`echo "$FLINK_ROOT_DIR"/opt/flink-python*java-binding.jar` +TABLE_JAR_PATH=`echo "$FLINK_HOME"/opt/flink-table*.jar` +PYTHON_JAR_PATH=`echo "$FLINK_HOME"/opt/flink-python*java-binding.jar` FLINK_TEST_CLASSPATH="" if [[ -n "$FLINK_TESTING" ]]; then diff --git a/flink-dist/src/main/flink-bin/bin/pyflink-stream.sh b/flink-dist/src/main/flink-bin/bin/pyflink-stream.sh index 3e44a10..5e1b1ae 100644 --- a/flink-dist/src/main/flink-bin/bin/pyflink-stream.sh +++ b/flink-dist/src/main/flink-bin/bin/pyflink-stream.sh @@ -22,4 +22,4 @@ bin=`cd "$bin"; pwd` . "$bin"/config.sh -"$FLINK_BIN_DIR"/flink run --class org.apache.flink.streaming.python.api.PythonStreamBinder -v "$FLINK_ROOT_DIR"/opt/flink-streaming-python*.jar "$@" +"$FLINK_BIN_DIR"/flink run --class org.apache.flink.streaming.python.api.PythonStreamBinder -v "$FLINK_HOME"/opt/flink-streaming-python*.jar "$@" diff --git a/flink-dist/src/main/flink-bin/bin/pyflink.bat b/flink-dist/src/main/flink-bin/bin/pyflink.bat index 4d7fa0e..65c4f21 100644 --- a/flink-dist/src/main/flink-bin/bin/pyflink.bat +++ b/flink-dist/src/main/flink-bin/bin/pyflink.bat @@ -20,6 +20,6 @@ setlocal EnableDelayedExpansion SET bin=%~dp0 -SET FLINK_ROOT_DIR=%bin%.. +SET FLINK_HOME=%bin%.. -"%FLINK_ROOT_DIR%\bin\flink" run -v "%FLINK_ROOT_DIR%"\opt\flink-python*.jar %* +"%FLINK_HOME%\bin\flink" run -v "%FLINK_HOME%"\opt\flink-python*.jar %* diff --git a/flink-dist/src/main/flink-bin/bin/pyflink.sh b/flink-dist/src/main/flink-bin/bin/pyflink.sh index 46470e8..8f7a55c 100644 --- a/flink-dist/src/main/flink-bin/bin/pyflink.sh +++ b/flink-dist/src/main/flink-bin/bin/pyflink.sh @@ -22,4 +22,4 @@ bin=`cd "$bin"; pwd` . "$bin"/config.sh -"$FLINK_BIN_DIR"/flink run -v "$FLINK_ROOT_DIR"/opt/flink-python_*.jar "$@" +"$FLINK_BIN_DIR"/flink run -v "$FLINK_HOME"/opt/flink-python_*.jar "$@" diff --git a/flink-dist/src/main/flink-bin/bin/start-cluster.bat b/flink-dist/src/main/flink-bin/bin/start-cluster.bat index eb94d31..a852a55 100644 --- a/flink-dist/src/main/flink-bin/bin/start-cluster.bat +++ b/flink-dist/src/main/flink-bin/bin/start-cluster.bat @@ -20,10 +20,10 @@ setlocal EnableDelayedExpansion SET bin=%~dp0 -SET FLINK_ROOT_DIR=%bin%.. -SET FLINK_LIB_DIR=%FLINK_ROOT_DIR%\lib -SET FLINK_CONF_DIR=%FLINK_ROOT_DIR%\conf -SET FLINK_LOG_DIR=%FLINK_ROOT_DIR%\log +SET FLINK_HOME=%bin%.. +SET FLINK_LIB_DIR=%FLINK_HOME%\lib +SET FLINK_CONF_DIR=%FLINK_HOME%\conf +SET FLINK_LOG_DIR=%FLINK_HOME%\log SET JVM_ARGS=-Xms1024m -Xmx1024m diff --git a/flink-table/flink-sql-client/bin/sql-client.sh b/flink-table/flink-sql-client/bin/sql-client.sh index e4e9315..817d9e6 100644 --- a/flink-table/flink-sql-client/bin/sql-client.sh +++ b/flink-table/flink-sql-client/bin/sql-client.sh @@ -56,7 +56,7 @@ CC_CLASSPATH=`constructFlinkClassPath` log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-sql-client-$HOSTNAME.log log_setting=(-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j-cli.properties -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml) -export FLINK_ROOT_DIR +export FLINK_HOME export FLINK_CONF_DIR # get path of jar in /opt if it exist
