[FLINK-2205] Fix confusing entries in JM UI Job Config. section

Default display for 'Number of execution retries' is now 'deactivated' and for 'Job parallelism' is 'auto', as suggested in JIRA.
apache · Jul 22, 2015 · d957523 · d957523
1 parent 0c53891
commit d957523
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JobManagerInfoServlet.java b/...-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JobManagerInfoServlet.java
@@ -441,7 +441,7 @@ private void writeJsonForArchivedJob(PrintWriter wrt, ExecutionGraph graph) {
 			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();

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
@@ -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>";
 		});