Skip to content

Commit

Permalink
[FLINK-2111] Make stoppable stream task and stoppable stream source o…
Browse files Browse the repository at this point in the history
…perator 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 apache#750.
  • Loading branch information
tillrohrmann committed Feb 15, 2016
1 parent bdd4024 commit f60f8fb
Show file tree
Hide file tree
Showing 26 changed files with 986 additions and 1,453 deletions.
3 changes: 2 additions & 1 deletion docs/apis/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ public void cancel(JobID jobId) throws Exception {
*
* @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.
*/
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
2 changes: 1 addition & 1 deletion flink-runtime-web/web-dashboard/app/partials/jobs/job.jade
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion flink-runtime-web/web-dashboard/web/css/vendor.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

153 changes: 81 additions & 72 deletions flink-runtime-web/web-dashboard/web/js/index.js

Large diffs are not rendered by default.

Loading

0 comments on commit f60f8fb

Please sign in to comment.