From 0d1f17cca2cd77435581c1cf823f3118f573d36c Mon Sep 17 00:00:00 2001 From: zhangminglei Date: Tue, 20 Jun 2017 18:28:33 +0800 Subject: [PATCH 1/2] [FLINK-6488] [scripts] Mark deprecated 'start-local.sh' and 'stop-local.sh' scripts --- flink-dist/src/main/flink-bin/bin/start-local.sh | 5 +++-- flink-dist/src/main/flink-bin/bin/stop-local.sh | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flink-dist/src/main/flink-bin/bin/start-local.sh b/flink-dist/src/main/flink-bin/bin/start-local.sh index b3d41bf1ee726..2df3c22f91329 100755 --- a/flink-dist/src/main/flink-bin/bin/start-local.sh +++ b/flink-dist/src/main/flink-bin/bin/start-local.sh @@ -19,10 +19,11 @@ STREAMING_MODE=$1 +echo "Warning: this file is deprecated and will be removed in 1.5." + bin=`dirname "$0"` bin=`cd "$bin"; pwd` . "$bin"/config.sh -# local mode, only bring up job manager. The job manager will start an internal task manager -"$FLINK_BIN_DIR"/jobmanager.sh start local +"$FLINK_BIN_DIR"/start-cluster.sh diff --git a/flink-dist/src/main/flink-bin/bin/stop-local.sh b/flink-dist/src/main/flink-bin/bin/stop-local.sh index 79627fa69322e..8d079e04c873b 100755 --- a/flink-dist/src/main/flink-bin/bin/stop-local.sh +++ b/flink-dist/src/main/flink-bin/bin/stop-local.sh @@ -17,11 +17,11 @@ # limitations under the License. ################################################################################ +echo "Warning: this file is deprecated and will be removed in 1.5." bin=`dirname "$0"` bin=`cd "$bin"; pwd` . "$bin"/config.sh -# stop local job manager (has an internal task manager) -"$FLINK_BIN_DIR"/jobmanager.sh stop +"$FLINK_BIN_DIR"/stop-cluster.sh From 1ab1fbc54a9f518a56382f6c3ce2fc9cf845b702 Mon Sep 17 00:00:00 2001 From: zhangminglei Date: Tue, 20 Jun 2017 18:30:07 +0800 Subject: [PATCH 2/2] [hotfix] Fix typo in JobManager --- .../scala/org/apache/flink/runtime/jobmanager/JobManager.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala index e488beffba5b8..f2934b52725c3 100644 --- a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala +++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala @@ -472,7 +472,7 @@ class JobManager( taskManagerGateway match { case x: ActorTaskManagerGateway => handleTaskManagerTerminated(x.getActorGateway().actor(), instance.getId) - case _ => log.debug(s"Cannot remove reosurce ${resourceID}, because there is " + + case _ => log.debug(s"Cannot remove resource ${resourceID}, because there is " + s"no ActorRef registered.") }