flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trohrm...@apache.org
Subject flink git commit: [FLINK-5365] Mesos AppMaster/TaskManager should obey sigterm
Date Mon, 23 Jan 2017 15:09:39 GMT
Repository: flink
Updated Branches:
  refs/heads/release-1.2 35da413b1 -> e0a784197


[FLINK-5365] Mesos AppMaster/TaskManager should obey sigterm

- use ‘exec’ in bash script to ensure that signals flow to the java
process.

This closes #3025.


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

Branch: refs/heads/release-1.2
Commit: e0a784197de6c6ff55d0d4e10d33199996240706
Parents: 35da413
Author: wrighe3 <eron.wright@emc.com>
Authored: Sun Dec 18 17:20:53 2016 -0800
Committer: Till Rohrmann <trohrmann@apache.org>
Committed: Mon Jan 23 16:09:21 2017 +0100

----------------------------------------------------------------------
 flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh   | 2 +-
 flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/e0a78419/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster.sh
----------------------------------------------------------------------
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 2fe66bb..6fae6c2 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
@@ -51,7 +51,7 @@ export FLINK_CONF_DIR
 export FLINK_BIN_DIR
 export FLINK_LIB_DIR
 
-$JAVA_RUN $JVM_ARGS -classpath "$CC_CLASSPATH" $log_setting org.apache.flink.mesos.runtime.clusterframework.MesosApplicationMasterRunner
"$@"
+exec $JAVA_RUN $JVM_ARGS -classpath "$CC_CLASSPATH" $log_setting org.apache.flink.mesos.runtime.clusterframework.MesosApplicationMasterRunner
"$@"
 
 rc=$?
 

http://git-wip-us.apache.org/repos/asf/flink/blob/e0a78419/flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager.sh
----------------------------------------------------------------------
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 ff03abd..23a301b 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
@@ -56,5 +56,5 @@ export FLINK_CONF_DIR
 export FLINK_BIN_DIR
 export FLINK_LIB_DIR
 
-$JAVA_RUN $JVM_ARGS ${FLINK_ENV_JAVA_OPTS} -classpath "$CC_CLASSPATH" $log_setting org.apache.flink.mesos.runtime.clusterframework.MesosTaskManager
"$@"
+exec $JAVA_RUN $JVM_ARGS ${FLINK_ENV_JAVA_OPTS} -classpath "$CC_CLASSPATH" $log_setting org.apache.flink.mesos.runtime.clusterframework.MesosTaskManager
"$@"
 


Mime
View raw message