[FLINK-2205] Fix confusing entries in JobManager WebUI JobConfig section. Default display for 'Number of execution retries' is now 'deactivated' and for 'Job parallelism' is 'auto', as suggested in JIRA.
This closes #927 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/b2d8c40a Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/b2d8c40a Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/b2d8c40a Branch: refs/heads/master Commit: b2d8c40a06e0a36e90913d316ff2b003b701fee1 Parents: 06b37bf Author: Enrique Bautista <ebautista...@gmail.com> Authored: Tue Jul 21 18:52:05 2015 +0200 Committer: Fabian Hueske <fhue...@apache.org> Committed: Tue Aug 4 18:14:52 2015 +0200 ---------------------------------------------------------------------- .../flink/runtime/jobmanager/web/JobManagerInfoServlet.java | 2 +- .../src/main/resources/web-docs-infoserver/js/analyzer.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/b2d8c40a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JobManagerInfoServlet.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JobManagerInfoServlet.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JobManagerInfoServlet.java index ce57714..0ecc941 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JobManagerInfoServlet.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JobManagerInfoServlet.java @@ -436,7 +436,7 @@ public class JobManagerInfoServlet extends HttpServlet { if(ec != null) { wrt.write("\"executionConfig\": {"); wrt.write("\"Execution Mode\": \""+ec.getExecutionMode()+"\","); - wrt.write("\"Number of execution retries\": \""+ec.getNumberOfExecutionRetries()+"\","); + wrt.write("\"Max. number of execution retries\": \""+ec.getNumberOfExecutionRetries()+"\","); wrt.write("\"Job parallelism\": \""+ec.getParallelism()+"\","); wrt.write("\"Object reuse mode\": \""+ec.isObjectReuseEnabled()+"\""); ExecutionConfig.GlobalJobParameters uc = ec.getGlobalJobParameters(); http://git-wip-us.apache.org/repos/asf/flink/blob/b2d8c40a/flink-runtime/src/main/resources/web-docs-infoserver/js/analyzer.js ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/js/analyzer.js b/flink-runtime/src/main/resources/web-docs-infoserver/js/analyzer.js index 3934017..4030f80 100644 --- a/flink-runtime/src/main/resources/web-docs-infoserver/js/analyzer.js +++ b/flink-runtime/src/main/resources/web-docs-infoserver/js/analyzer.js @@ -107,6 +107,10 @@ function analyzeTime(json, stacked) { $.each(job.executionConfig, function(key, value) { if(key == "userConfig") { return; + } else if(key == "Max. number of execution retries" && value == -1) { + value = "deactivated"; + } else if(key == "Job parallelism" && value == -1) { + value = "auto"; } configTable += "<tr><td>"+key+"</td><td>"+value+"</td></tr>"; });
