[FLINK-2111] Make stoppable stream task and stoppable stream source operator type safe
Update index.js and reset vendor.css and vendor.js to master version Update web-dashboard Remove duplicate flink-runtime-web dependency from flink-tests Remove not used ProgramStopException Change stopping behaviour to only work in job status RUNNING This closes #750. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f60f8fbc Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f60f8fbc Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f60f8fbc Branch: refs/heads/master Commit: f60f8fbc69cd1c36a3a99b08b0e76100b9032fae Parents: bdd4024 Author: Till Rohrmann <[email protected]> Authored: Thu Feb 11 12:40:21 2016 +0100 Committer: Till Rohrmann <[email protected]> Committed: Mon Feb 15 16:17:36 2016 +0100 ---------------------------------------------------------------------- docs/apis/cli.md | 3 +- .../org/apache/flink/client/program/Client.java | 2 +- .../client/program/ProgramStopException.java | 53 - .../api/common/functions/StoppableFunction.java | 2 +- .../web-dashboard/app/partials/jobs/job.jade | 2 +- .../web-dashboard/web/css/vendor.css | 1 - flink-runtime-web/web-dashboard/web/js/index.js | 153 +- .../web-dashboard/web/js/vendor.js | 2053 +++++++----------- .../web/partials/jobs/job.config.html | 2 +- .../web-dashboard/web/partials/jobs/job.html | 2 +- .../runtime/jobgraph/tasks/StoppableTask.java | 4 +- .../flink/runtime/jobmanager/JobManager.scala | 31 +- .../flink/runtime/taskmanager/TaskManager.scala | 6 +- .../ExecutionGraphSignalsTest.java | 10 +- .../executiongraph/LocalInputSplitsTest.java | 4 +- .../api/datastream/DataStreamSource.java | 2 +- .../environment/StreamExecutionEnvironment.java | 22 +- .../api/operators/StoppableStreamSource.java | 20 +- .../streaming/api/operators/StreamSource.java | 20 +- .../transformations/SourceTransformation.java | 6 +- .../runtime/tasks/SourceStreamTask.java | 6 +- .../tasks/StoppableSourceStreamTask.java | 10 +- .../operators/FoldApplyWindowFunctionTest.java | 2 +- .../runtime/tasks/SourceStreamTaskTest.java | 13 +- .../streaming/runtime/tasks/StreamTaskTest.java | 2 +- flink-tests/pom.xml | 8 - 26 files changed, 986 insertions(+), 1453 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/f60f8fbc/docs/apis/cli.md ---------------------------------------------------------------------- diff --git a/docs/apis/cli.md b/docs/apis/cli.md index 421ed94..435c680 100644 --- a/docs/apis/cli.md +++ b/docs/apis/cli.md @@ -252,7 +252,8 @@ Action "cancel" cancels a running program. configuration. -Action "stop" stops a running program (streaming jobs only). +Action "stop" stops a running program (streaming jobs only). There are no strong consistency +guarantees for a stop request. Syntax: stop [OPTIONS] <Job ID> "stop" action options: http://git-wip-us.apache.org/repos/asf/flink/blob/f60f8fbc/flink-clients/src/main/java/org/apache/flink/client/program/Client.java ---------------------------------------------------------------------- diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/Client.java b/flink-clients/src/main/java/org/apache/flink/client/program/Client.java index 999b461..3044088 100644 --- a/flink-clients/src/main/java/org/apache/flink/client/program/Client.java +++ b/flink-clients/src/main/java/org/apache/flink/client/program/Client.java @@ -443,7 +443,7 @@ public class Client { * * @param jobId * the job ID of the streaming program to stop - * @throws ProgramStopException + * @throws Exception * If the job ID is invalid (ie, is unknown or refers to a batch job) or if sending the stop signal * failed. That might be due to an I/O problem, ie, the job-manager is unreachable. */ http://git-wip-us.apache.org/repos/asf/flink/blob/f60f8fbc/flink-clients/src/main/java/org/apache/flink/client/program/ProgramStopException.java ---------------------------------------------------------------------- diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/ProgramStopException.java b/flink-clients/src/main/java/org/apache/flink/client/program/ProgramStopException.java deleted file mode 100644 index a1d8a9b..0000000 --- a/flink-clients/src/main/java/org/apache/flink/client/program/ProgramStopException.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE - * file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.apache.flink.client.program; - -/** - * Exception used to indicate that there is an error during stopping of a Flink program. - */ -public class ProgramStopException extends Exception { - private static final long serialVersionUID = -906791331829704450L; - - /** - * Creates a <tt>ProgramStopException</tt> with the given message. - * - * @param message - * The message for the exception. - */ - public ProgramStopException(String message) { - super(message); - } - - /** - * Creates a <tt>ProgramStopException</tt> for the given exception. - * - * @param cause - * The exception that causes the program invocation to fail. - */ - public ProgramStopException(Throwable cause) { - super(cause); - } - - /** - * Creates a <tt>ProgramStopException</tt> for the given exception with an additional message. - * - * @param message - * The additional message. - * @param cause - * The exception that causes the program invocation to fail. - */ - public ProgramStopException(String message, Throwable cause) { - super(message, cause); - } -} http://git-wip-us.apache.org/repos/asf/flink/blob/f60f8fbc/flink-core/src/main/java/org/apache/flink/api/common/functions/StoppableFunction.java ---------------------------------------------------------------------- diff --git a/flink-core/src/main/java/org/apache/flink/api/common/functions/StoppableFunction.java b/flink-core/src/main/java/org/apache/flink/api/common/functions/StoppableFunction.java index a83b73f..51dd779 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/functions/StoppableFunction.java +++ b/flink-core/src/main/java/org/apache/flink/api/common/functions/StoppableFunction.java @@ -29,5 +29,5 @@ public interface StoppableFunction { * <p> * <strong>The call to {@code stop()} should not block and not throw any exception.</strong> */ - public void stop(); + void stop(); } http://git-wip-us.apache.org/repos/asf/flink/blob/f60f8fbc/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade ---------------------------------------------------------------------- diff --git a/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade b/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade index fe3e0fc..39a6a1c 100644 --- a/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade +++ b/flink-runtime-web/web-dashboard/app/partials/jobs/job.jade @@ -43,7 +43,7 @@ nav.navbar.navbar-default.navbar-fixed-top.navbar-main(ng-if="job") span.navbar-info-button.btn.btn-default(ng-click="cancelJob($event)") | Cancel - .navbar-info.last.first(ng-if!="job.isStoppable && (job.state=='CREATED' || job.state=='RUNNING' || job.state=='RESTARTING')") + .navbar-info.last.first(ng-if!="job.isStoppable && job.state=='RUNNING'") span.navbar-info-button.btn.btn-default(ng-click="stopJob($event)") | Stop http://git-wip-us.apache.org/repos/asf/flink/blob/f60f8fbc/flink-runtime-web/web-dashboard/web/css/vendor.css ---------------------------------------------------------------------- diff --git a/flink-runtime-web/web-dashboard/web/css/vendor.css b/flink-runtime-web/web-dashboard/web/css/vendor.css index e0c9259..2a8d00f 100644 --- a/flink-runtime-web/web-dashboard/web/css/vendor.css +++ b/flink-runtime-web/web-dashboard/web/css/vendor.css @@ -5902,7 +5902,6 @@ button.close { .modal-header { padding: 15px; border-bottom: 1px solid #e5e5e5; - min-height: 16.42857143px; } .modal-header .close { margin-top: -2px;
