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 9871f252e683412f9b56eeba1c8013330248e75d Author: Piotr Nowojski <[email protected]> AuthorDate: Wed Apr 24 12:11:18 2019 +0200 [hotfix][dist] Export variables in only one place (config.sh) Previously exporting of variables like FLINK_CONF_DIR, FLINK_BIN_DIR, FLINK_LIB_DIR, ... was scattered or even dupliacted in multiple places. Now it happens only in config.sh. --- flink-dist/src/main/flink-bin/bin/config.sh | 14 ++++++++------ flink-dist/src/main/flink-bin/bin/flink | 3 --- .../src/main/flink-bin/mesos-bin/mesos-appmaster-job.sh | 4 ---- flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh | 4 ---- .../src/main/flink-bin/mesos-bin/mesos-taskmanager.sh | 4 ---- flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh | 2 -- flink-table/flink-sql-client/bin/sql-client.sh | 3 --- 7 files changed, 8 insertions(+), 26 deletions(-) diff --git a/flink-dist/src/main/flink-bin/bin/config.sh b/flink-dist/src/main/flink-bin/bin/config.sh index 3af82b2..e430e91 100755 --- a/flink-dist/src/main/flink-bin/bin/config.sh +++ b/flink-dist/src/main/flink-bin/bin/config.sh @@ -300,12 +300,6 @@ 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 -# export /lib dir to access it during deployment of the Yarn staging files -export FLINK_LIB_DIR -# export /opt dir to access it for the SQL client -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 @@ -317,6 +311,14 @@ DEFAULT_FLINK_LOG_DIR=$FLINK_HOME_DIR_MANGLED/log FLINK_CONF_FILE="flink-conf.yaml" YAML_CONF=${FLINK_CONF_DIR}/${FLINK_CONF_FILE} +### Exported environment variables ### +export FLINK_CONF_DIR +export FLINK_BIN_DIR +# export /lib dir to access it during deployment of the Yarn staging files +export FLINK_LIB_DIR +# export /opt dir to access it for the SQL client +export FLINK_OPT_DIR + ######################################################################################################################## # ENVIRONMENT VARIABLES ######################################################################################################################## diff --git a/flink-dist/src/main/flink-bin/bin/flink b/flink-dist/src/main/flink-bin/bin/flink index 113d4ec..9e01d4b 100644 --- a/flink-dist/src/main/flink-bin/bin/flink +++ b/flink-dist/src/main/flink-bin/bin/flink @@ -48,8 +48,5 @@ 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_HOME -export FLINK_CONF_DIR - # Add HADOOP_CLASSPATH to allow the usage of Hadoop file systems exec $JAVA_RUN $JVM_ARGS "${log_setting[@]}" -classpath "`manglePathList "$CC_CLASSPATH:$INTERNAL_HADOOP_CLASSPATHS"`" org.apache.flink.client.cli.CliFrontend "$@" diff --git a/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster-job.sh b/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster-job.sh index b21670a..3d67d38 100755 --- a/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster-job.sh +++ b/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster-job.sh @@ -32,10 +32,6 @@ CC_CLASSPATH=`manglePathList $(constructFlinkClassPath):$INTERNAL_HADOOP_CLASSPA log="${FLINK_LOG_DIR}/flink-${FLINK_IDENT_STRING}-mesos-appmaster-${HOSTNAME}.log" log_setting="-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j.properties -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml" -export FLINK_CONF_DIR -export FLINK_BIN_DIR -export FLINK_LIB_DIR - exec $JAVA_RUN $JVM_ARGS -classpath "$CC_CLASSPATH" $log_setting org.apache.flink.mesos.entrypoint.MesosJobClusterEntrypoint "$@" rc=$? diff --git a/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh b/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh index f8a94b4..b49fba8 100755 --- a/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh +++ b/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh @@ -32,10 +32,6 @@ CC_CLASSPATH=`manglePathList $(constructFlinkClassPath):$INTERNAL_HADOOP_CLASSPA log="${FLINK_LOG_DIR}/flink-${FLINK_IDENT_STRING}-mesos-appmaster-${HOSTNAME}.log" log_setting="-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j.properties -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml" -export FLINK_CONF_DIR -export FLINK_BIN_DIR -export FLINK_LIB_DIR - ENTRY_POINT=org.apache.flink.mesos.entrypoint.MesosSessionClusterEntrypoint exec $JAVA_RUN $JVM_ARGS -classpath "$CC_CLASSPATH" $log_setting ${ENTRY_POINT} "$@" diff --git a/flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager.sh b/flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager.sh index a484d09..52232ab 100755 --- a/flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager.sh +++ b/flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager.sh @@ -37,10 +37,6 @@ export FLINK_ENV_JAVA_OPTS="${FLINK_ENV_JAVA_OPTS} ${FLINK_ENV_JAVA_OPTS_MEM}" # Add TaskManager-specific JVM options export FLINK_ENV_JAVA_OPTS="${FLINK_ENV_JAVA_OPTS} ${FLINK_ENV_JAVA_OPTS_TM}" -export FLINK_CONF_DIR -export FLINK_BIN_DIR -export FLINK_LIB_DIR - ENTRY_POINT=org.apache.flink.mesos.entrypoint.MesosTaskExecutorRunner exec $JAVA_RUN $JVM_ARGS ${FLINK_ENV_JAVA_OPTS} -classpath "$CC_CLASSPATH" $log_setting ${ENTRY_POINT} "$@" diff --git a/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh b/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh index 03b1e3a..a41a1de 100755 --- a/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh +++ b/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh @@ -34,7 +34,5 @@ CC_CLASSPATH=`manglePathList $(constructFlinkClassPath):$INTERNAL_HADOOP_CLASSPA log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-yarn-session-$HOSTNAME.log log_setting="-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j-yarn-session.properties -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback-yarn.xml" -export FLINK_CONF_DIR - $JAVA_RUN $JVM_ARGS -classpath "$CC_CLASSPATH" $log_setting org.apache.flink.yarn.cli.FlinkYarnSessionCli -j "$FLINK_LIB_DIR"/flink-dist*.jar "$@" diff --git a/flink-table/flink-sql-client/bin/sql-client.sh b/flink-table/flink-sql-client/bin/sql-client.sh index 817d9e6..9ba20bd 100644 --- a/flink-table/flink-sql-client/bin/sql-client.sh +++ b/flink-table/flink-sql-client/bin/sql-client.sh @@ -56,9 +56,6 @@ 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_HOME -export FLINK_CONF_DIR - # get path of jar in /opt if it exist FLINK_SQL_CLIENT_JAR=$(find "$FLINK_OPT_DIR" -regex ".*flink-sql-client.*.jar")
