[FLINK-8471] [flip6] Merge Flip-6 and old Mesos start up scripts into…

… one
laubersder · Feb 6, 2018 · 6316087 · 6316087
1 parent 88e25c2
commit 6316087
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 94 deletions.
diff --git a/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster-flip6-session.sh b/flink-dist/src/main/flink-bin/mesos-bin/mesos-appmaster-flip6-session.sh
diff --git a/...in/mesos-bin/mesos-appmaster-flip6-job.sh → ...link-bin/mesos-bin/mesos-appmaster-job.sh b/...in/mesos-bin/mesos-appmaster-flip6-job.sh → ...link-bin/mesos-bin/mesos-appmaster-job.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
@@ -36,7 +36,13 @@ export FLINK_CONF_DIR
 export FLINK_BIN_DIR
 export FLINK_LIB_DIR
 
-exec $JAVA_RUN $JVM_ARGS -classpath "$CC_CLASSPATH" $log_setting org.apache.flink.mesos.runtime.clusterframework.MesosApplicationMasterRunner "$@"
+ENTRY_POINT=org.apache.flink.mesos.runtime.clusterframework.MesosApplicationMasterRunner
+
+if [[ "${FLINK_MODE}" == "flip6" ]]; then
+ ENTRY_POINT=org.apache.flink.mesos.entrypoint.MesosSessionClusterEntrypoint
+fi
+
+exec $JAVA_RUN $JVM_ARGS -classpath "$CC_CLASSPATH" $log_setting ${ENTRY_POINT} "$@"
 
 rc=$?
 

diff --git a/flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager-flip6.sh b/flink-dist/src/main/flink-bin/mesos-bin/mesos-taskmanager-flip6.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
@@ -41,5 +41,11 @@ export FLINK_CONF_DIR
 export FLINK_BIN_DIR
 export FLINK_LIB_DIR
 
-exec $JAVA_RUN $JVM_ARGS ${FLINK_ENV_JAVA_OPTS} -classpath "$CC_CLASSPATH" $log_setting org.apache.flink.mesos.runtime.clusterframework.MesosTaskManager "$@"
+ENTRY_POINT=org.apache.flink.mesos.runtime.clusterframework.MesosTaskManager
+
+if [[ "${FLINK_MODE}" == "flip6" ]]; then
+ ENTRY_POINT=org.apache.flink.mesos.entrypoint.MesosTaskExecutorRunner
+fi
+
+exec $JAVA_RUN $JVM_ARGS ${FLINK_ENV_JAVA_OPTS} -classpath "$CC_CLASSPATH" $log_setting ${ENTRY_POINT} "$@"