Repository: flink Updated Branches: refs/heads/master 6067833fb -> a5150a90c
[FLINK-1433] Add HADOOP_CLASSPATH to start scripts This closes #337 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/a5150a90 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/a5150a90 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/a5150a90 Branch: refs/heads/master Commit: a5150a90c3df89bced5051204e9025103c0d48d7 Parents: 6067833 Author: Robert Metzger <[email protected]> Authored: Sun Jan 25 16:05:20 2015 +0100 Committer: Robert Metzger <[email protected]> Committed: Tue Jan 27 12:19:10 2015 +0100 ---------------------------------------------------------------------- docs/example_connectors.md | 1 + flink-dist/src/main/flink-bin/bin/jobmanager.sh | 2 +- flink-dist/src/main/flink-bin/bin/taskmanager.sh | 2 +- flink-dist/src/main/flink-bin/bin/webclient.sh | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/a5150a90/docs/example_connectors.md ---------------------------------------------------------------------- diff --git a/docs/example_connectors.md b/docs/example_connectors.md index cde8c30..2e55e12 100644 --- a/docs/example_connectors.md +++ b/docs/example_connectors.md @@ -54,6 +54,7 @@ For example for tachyon support, there must be the following entry in the `core- </property> ~~~ +Also, the required classes for using the file system need to be placed in the `lib/` folder of the Flink installation (on all machines running Flink). If putting the files into the directory is not possible, Flink is also respecting the `HADOOP_CLASSPATH` environment variable to add Hadoop jar files to the classpath. ## Connecting to other systems using Input / Output Format wrappers for Hadoop http://git-wip-us.apache.org/repos/asf/flink/blob/a5150a90/flink-dist/src/main/flink-bin/bin/jobmanager.sh ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/flink-bin/bin/jobmanager.sh b/flink-dist/src/main/flink-bin/bin/jobmanager.sh index c545324..ddb329f 100755 --- a/flink-dist/src/main/flink-bin/bin/jobmanager.sh +++ b/flink-dist/src/main/flink-bin/bin/jobmanager.sh @@ -80,7 +80,7 @@ case $STARTSTOP in rotateLogFile $out echo Starting job manager - $JAVA_RUN $JVM_ARGS ${FLINK_ENV_JAVA_OPTS} "${log_setting[@]}" -classpath "$FLINK_JM_CLASSPATH" org.apache.flink.runtime.jobmanager.JobManager --executionMode $EXECUTIONMODE --configDir "$FLINK_CONF_DIR" > "$out" 2>&1 < /dev/null & + $JAVA_RUN $JVM_ARGS ${FLINK_ENV_JAVA_OPTS} "${log_setting[@]}" -classpath "$FLINK_JM_CLASSPATH:$HADOOP_CLASSPATH" org.apache.flink.runtime.jobmanager.JobManager --executionMode $EXECUTIONMODE --configDir "$FLINK_CONF_DIR" > "$out" 2>&1 < /dev/null & echo $! > $pid ;; http://git-wip-us.apache.org/repos/asf/flink/blob/a5150a90/flink-dist/src/main/flink-bin/bin/taskmanager.sh ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/flink-bin/bin/taskmanager.sh b/flink-dist/src/main/flink-bin/bin/taskmanager.sh index 74f81f2..c63b0ae 100755 --- a/flink-dist/src/main/flink-bin/bin/taskmanager.sh +++ b/flink-dist/src/main/flink-bin/bin/taskmanager.sh @@ -77,7 +77,7 @@ case $STARTSTOP in rotateLogFile $out echo Starting task manager on host $HOSTNAME - $JAVA_RUN $JVM_ARGS ${FLINK_ENV_JAVA_OPTS} "${log_setting[@]}" -classpath "$FLINK_TM_CLASSPATH" org.apache.flink.runtime.taskmanager.TaskManager --configDir "$FLINK_CONF_DIR" > "$out" 2>&1 < /dev/null & + $JAVA_RUN $JVM_ARGS ${FLINK_ENV_JAVA_OPTS} "${log_setting[@]}" -classpath "$FLINK_TM_CLASSPATH:$HADOOP_CLASSPATH" org.apache.flink.runtime.taskmanager.TaskManager --configDir "$FLINK_CONF_DIR" > "$out" 2>&1 < /dev/null & echo $! > $pid ;; http://git-wip-us.apache.org/repos/asf/flink/blob/a5150a90/flink-dist/src/main/flink-bin/bin/webclient.sh ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/flink-bin/bin/webclient.sh b/flink-dist/src/main/flink-bin/bin/webclient.sh index e096a0e..1c3e61c 100755 --- a/flink-dist/src/main/flink-bin/bin/webclient.sh +++ b/flink-dist/src/main/flink-bin/bin/webclient.sh @@ -64,7 +64,7 @@ case $STARTSTOP in fi fi echo Starting Flink webclient - $JAVA_RUN $JVM_ARGS "${log_setting[@]}" -classpath "$FLINK_WEBCLIENT_CLASSPATH" org.apache.flink.client.WebFrontend --configDir "$FLINK_CONF_DIR" > "$out" 2>&1 < /dev/null & + $JAVA_RUN $JVM_ARGS "${log_setting[@]}" -classpath "$FLINK_WEBCLIENT_CLASSPATH:$HADOOP_CLASSPATH" org.apache.flink.client.WebFrontend --configDir "$FLINK_CONF_DIR" > "$out" 2>&1 < /dev/null & echo $! > $pid ;;
