flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmetz...@apache.org
Subject flink git commit: [FLINK-1433] Add HADOOP_CLASSPATH to start scripts This closes #337
Date Tue, 27 Jan 2015 11:23:39 GMT
Repository: flink
Updated Branches:
  refs/heads/release-0.8 8ca7cbadb -> 2387a08e4


[FLINK-1433] Add HADOOP_CLASSPATH to start scripts
This closes #337

Conflicts:
	flink-dist/src/main/flink-bin/bin/jobmanager.sh
	flink-dist/src/main/flink-bin/bin/taskmanager.sh
	flink-dist/src/main/flink-bin/bin/webclient.sh


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/2387a08e
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/2387a08e
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/2387a08e

Branch: refs/heads/release-0.8
Commit: 2387a08e442b0adf49c2d9dc657d5072bb0af3da
Parents: 8ca7cba
Author: Robert Metzger <rmetzger@apache.org>
Authored: Sun Jan 25 16:05:20 2015 +0100
Committer: Robert Metzger <rmetzger@apache.org>
Committed: Tue Jan 27 12:23:03 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/2387a08e/docs/example_connectors.md
----------------------------------------------------------------------
diff --git a/docs/example_connectors.md b/docs/example_connectors.md
index c65f06f..dfd43da 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/2387a08e/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 af8f379..0a9f9f7 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/2387a08e/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 89ec4b5..0bf54e3 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/2387a08e/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 9df3134..ecf86ff 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
 	;;
 


Mime
View raw message