You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrql.apache.org by fe...@apache.org on 2015/07/24 18:08:11 UTC
incubator-mrql git commit: [MRQL-76] Change the mrql.flink shell
script to work with Flink 0.9.0
Repository: incubator-mrql
Updated Branches:
refs/heads/master ed85c1894 -> 4c1fbcf74
[MRQL-76] Change the mrql.flink shell script to work with Flink 0.9.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-mrql/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mrql/commit/4c1fbcf7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mrql/tree/4c1fbcf7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mrql/diff/4c1fbcf7
Branch: refs/heads/master
Commit: 4c1fbcf74910ff33c2c5babaa09c6ac7253f99e5
Parents: ed85c18
Author: fegaras <fe...@cse.uta.edu>
Authored: Fri Jul 24 10:06:16 2015 -0500
Committer: fegaras <fe...@cse.uta.edu>
Committed: Fri Jul 24 10:06:16 2015 -0500
----------------------------------------------------------------------
bin/mrql.flink | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/4c1fbcf7/bin/mrql.flink
----------------------------------------------------------------------
diff --git a/bin/mrql.flink b/bin/mrql.flink
index 40d7777..f3b4b37 100755
--- a/bin/mrql.flink
+++ b/bin/mrql.flink
@@ -21,6 +21,7 @@
#--------------------------------------------------------------------------------
#
# run Apache MRQL in Apache Flink mode
+# (need to run $FLINK_HOME/bin/yarn-session.sh on a separate window first)
#
#--------------------------------------------------------------------------------
@@ -54,14 +55,15 @@ fi
if [ "$1" == "-dist" ]; then
if ([ -a $FLINK_HOME/conf/.yarn-jobmanager ]); then
export FLINK_MASTER=`cat $FLINK_HOME/conf/.yarn-jobmanager`
- fi
- if ([ -a $FLINK_HOME/conf/.yarn-properties ]); then
+ elif ([ -a $FLINK_HOME/conf/.yarn-properties ]); then
. $FLINK_HOME/conf/.yarn-properties
export FLINK_MASTER=$jobManager
+ else
+ export FLINK_MASTER=
fi
args=" -flink $*"
args=${args// /\!}
- $FLINK_HOME/bin/flink run $FULL_JAR -c org.apache.mrql.Main -v args $args
+ $FLINK_HOME/bin/flink run -c org.apache.mrql.Main $FULL_JAR args $args | grep -v " switched to "
else
- $JAVA_HOME/bin/java -classpath "$FULL_JAR:$FLINK_JARS" org.apache.mrql.Main -flink $*
+ $JAVA_HOME/bin/java -classpath "$FULL_JAR:$FLINK_JARS" org.apache.mrql.Main -flink $* | grep -v " switched to "
fi