flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fhue...@apache.org
Subject [1/2] flink git commit: [FLINK-2205] Fix confusing entries in JobManager WebUI JobConfig section.
Date Tue, 04 Aug 2015 19:10:59 GMT
Repository: flink
Updated Branches:
  refs/heads/release-0.9 acb6ea81a -> 80d3478c0


[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.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8797890d
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8797890d
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8797890d

Branch: refs/heads/release-0.9
Commit: 8797890d2804541f38ebe1c8661603848f3e5a39
Parents: acb6ea8
Author: Enrique Bautista <ebautistabar@gmail.com>
Authored: Tue Jul 21 18:52:05 2015 +0200
Committer: Fabian Hueske <fhueske@apache.org>
Committed: Tue Aug 4 21:09:54 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/8797890d/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 82ab63e..a164d5a 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
@@ -441,7 +441,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/8797890d/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>";
 		});


Mime
View raw message