Repository: flink Updated Branches: refs/heads/master 889c63e56 -> 9f928d1ec
[FLINK-4287] Ensure the yarn-session.sh classpath contains all Hadoop related paths This closes #2317 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/9f928d1e Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/9f928d1e Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/9f928d1e Branch: refs/heads/master Commit: 9f928d1eca5b0cb459b55585bafb38322ceb7182 Parents: 889c63e Author: Niels Basjes <[email protected]> Authored: Mon Aug 1 12:11:11 2016 +0200 Committer: Maximilian Michels <[email protected]> Committed: Wed Aug 17 16:02:51 2016 +0200 ---------------------------------------------------------------------- flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/9f928d1e/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh ---------------------------------------------------------------------- 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 502df3d..a0b531f 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 @@ -42,7 +42,7 @@ constructCLIClientClassPath() { CC_CLASSPATH=$CC_CLASSPATH:$jarfile fi done - echo $CC_CLASSPATH + echo $CC_CLASSPATH:$INTERNAL_HADOOP_CLASSPATHS } CC_CLASSPATH=`manglePathList $(constructCLIClientClassPath)` @@ -52,5 +52,5 @@ log_setting="-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4 export FLINK_CONF_DIR -$JAVA_RUN $JVM_ARGS -classpath "$CC_CLASSPATH:$HADOOP_CLASSPATH:$HADOOP_CONF_DIR:$YARN_CONF_DIR" $log_setting org.apache.flink.yarn.cli.FlinkYarnSessionCli -j "$FLINK_LIB_DIR"/flink-dist*.jar "$@" +$JAVA_RUN $JVM_ARGS -classpath "$CC_CLASSPATH" $log_setting org.apache.flink.yarn.cli.FlinkYarnSessionCli -j "$FLINK_LIB_DIR"/flink-dist*.jar "$@"
