flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [1/4] git commit: [FLINK-942] Fix bug in config.sh to correctly set user-specified JVM args
Date Tue, 17 Jun 2014 22:18:48 GMT
Repository: incubator-flink
Updated Branches:
  refs/heads/master ca2b287a7 -> 9a75e685a


[FLINK-942] Fix bug in config.sh to correctly set user-specified JVM args

This closes #22


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

Branch: refs/heads/master
Commit: 6a549325f3c1e98b4c353e9bec6f951affb95bc9
Parents: ca2b287
Author: uce <u.celebi@fu-berlin.de>
Authored: Mon Jun 16 22:17:48 2014 +0200
Committer: Stephan Ewen <sewen@apache.org>
Committed: Tue Jun 17 14:23:24 2014 +0200

----------------------------------------------------------------------
 stratosphere-dist/src/main/stratosphere-bin/bin/config.sh      | 6 +++---
 stratosphere-dist/src/main/stratosphere-bin/bin/jobmanager.sh  | 2 +-
 stratosphere-dist/src/main/stratosphere-bin/bin/taskmanager.sh | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/6a549325/stratosphere-dist/src/main/stratosphere-bin/bin/config.sh
----------------------------------------------------------------------
diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/config.sh b/stratosphere-dist/src/main/stratosphere-bin/bin/config.sh
index bd6c302..9168813 100755
--- a/stratosphere-dist/src/main/stratosphere-bin/bin/config.sh
+++ b/stratosphere-dist/src/main/stratosphere-bin/bin/config.sh
@@ -167,12 +167,12 @@ if [ -z "${STRATOSPHERE_PID_DIR}" ]; then
     STRATOSPHERE_PID_DIR=$(readFromConfig ${KEY_ENV_PID_DIR} "${DEFAULT_ENV_PID_DIR}" "${YAML_CONF}")
 fi
 
-if [ -z "${STRATOSPHERE_OPTS}" ]; then
-    STRATOSPHERE_OPTS=$(readFromConfig ${KEY_ENV_JAVA_OPTS} "${DEFAULT_ENV_JAVA_OPTS}" "${YAML_CONF}")
+if [ -z "${STRATOSPHERE_ENV_JAVA_OPTS}" ]; then
+    STRATOSPHERE_ENV_JAVA_OPTS=$(readFromConfig ${KEY_ENV_JAVA_OPTS} "${DEFAULT_ENV_JAVA_OPTS}"
"${YAML_CONF}")
 fi
 
 if [ -z "${STRATOSPHERE_SSH_OPTS}" ]; then
-    STRATOSPHERE_OPTS=$(readFromConfig ${KEY_ENV_SSH_OPTS} "${DEFAULT_ENV_SSH_OPTS}" "${YAML_CONF}")
+    STRATOSPHERE_SSH_OPTS=$(readFromConfig ${KEY_ENV_SSH_OPTS} "${DEFAULT_ENV_SSH_OPTS}"
"${YAML_CONF}")
 fi
 
 # Arguments for the JVM. Used for job and task manager JVMs.

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/6a549325/stratosphere-dist/src/main/stratosphere-bin/bin/jobmanager.sh
----------------------------------------------------------------------
diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/jobmanager.sh b/stratosphere-dist/src/main/stratosphere-bin/bin/jobmanager.sh
index d41874c..e474e5e 100755
--- a/stratosphere-dist/src/main/stratosphere-bin/bin/jobmanager.sh
+++ b/stratosphere-dist/src/main/stratosphere-bin/bin/jobmanager.sh
@@ -72,7 +72,7 @@ case $STARTSTOP in
         rotateLogFile $out
 
         echo Starting job manager
-        $JAVA_RUN $JVM_ARGS $STRATOSPHERE_OPTS "${log_setting[@]}" -classpath "$STRATOSPHERE_JM_CLASSPATH"
eu.stratosphere.nephele.jobmanager.JobManager -executionMode $EXECUTIONMODE -configDir "$STRATOSPHERE_CONF_DIR"
 > "$out" 2>&1 < /dev/null &
+        $JAVA_RUN $JVM_ARGS $STRATOSPHERE_ENV_JAVA_OPTS "${log_setting[@]}" -classpath "$STRATOSPHERE_JM_CLASSPATH"
eu.stratosphere.nephele.jobmanager.JobManager -executionMode $EXECUTIONMODE -configDir "$STRATOSPHERE_CONF_DIR"
 > "$out" 2>&1 < /dev/null &
         echo $! > $pid
     ;;
 

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/6a549325/stratosphere-dist/src/main/stratosphere-bin/bin/taskmanager.sh
----------------------------------------------------------------------
diff --git a/stratosphere-dist/src/main/stratosphere-bin/bin/taskmanager.sh b/stratosphere-dist/src/main/stratosphere-bin/bin/taskmanager.sh
index 0800be6..ea6e468 100755
--- a/stratosphere-dist/src/main/stratosphere-bin/bin/taskmanager.sh
+++ b/stratosphere-dist/src/main/stratosphere-bin/bin/taskmanager.sh
@@ -69,7 +69,7 @@ case $STARTSTOP in
         rotateLogFile $out
 
         echo Starting task manager on host $HOSTNAME
-        $JAVA_RUN $JVM_ARGS $STRATOSPHERE_OPTS "${log_setting[@]}" -classpath "$STRATOSPHERE_TM_CLASSPATH"
eu.stratosphere.nephele.taskmanager.TaskManager -configDir "$STRATOSPHERE_CONF_DIR" > "$out"
2>&1 < /dev/null &
+        $JAVA_RUN $JVM_ARGS $STRATOSPHERE_ENV_JAVA_OPTS "${log_setting[@]}" -classpath "$STRATOSPHERE_TM_CLASSPATH"
eu.stratosphere.nephele.taskmanager.TaskManager -configDir "$STRATOSPHERE_CONF_DIR" > "$out"
2>&1 < /dev/null &
         echo $! > $pid
     ;;
 


Mime
View raw message