You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2014/09/21 04:13:22 UTC
[58/63] [abbrv] git commit: Update web frontend javascript to new
states Small fix in integration test
Update web frontend javascript to new states
Small fix in integration test
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/3e644000
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/3e644000
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/3e644000
Branch: refs/heads/master
Commit: 3e6440008c5e310f0026a92182eb0b3557a13504
Parents: 9803657
Author: Stephan Ewen <se...@apache.org>
Authored: Thu Sep 18 15:20:36 2014 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sat Sep 20 20:21:02 2014 +0200
----------------------------------------------------------------------
.../web-docs-infoserver/js/jobmanagerFrontend.js | 14 +++++---------
.../flink/runtime/jobmanager/web/JsonFactory.java | 2 +-
.../jobmanager/CoLocationConstraintITCase.java | 2 --
3 files changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/3e644000/flink-runtime/resources/web-docs-infoserver/js/jobmanagerFrontend.js
----------------------------------------------------------------------
diff --git a/flink-runtime/resources/web-docs-infoserver/js/jobmanagerFrontend.js b/flink-runtime/resources/web-docs-infoserver/js/jobmanagerFrontend.js
index 5daabe8..c0f54f7 100644
--- a/flink-runtime/resources/web-docs-infoserver/js/jobmanagerFrontend.js
+++ b/flink-runtime/resources/web-docs-infoserver/js/jobmanagerFrontend.js
@@ -194,10 +194,10 @@ function fillTable(table, json) {
$.each(job.groupvertices, function(j, groupvertex) {
countGroups++;
countTasks += groupvertex.numberofgroupmembers;
- starting = (groupvertex.CREATED + groupvertex.SCHEDULED + groupvertex.ASSIGNED + groupvertex.READY + groupvertex.STARTING);
+ starting = (groupvertex.CREATED + groupvertex.SCHEDULED + groupvertex.DEPLOYING);
countStarting += starting;
countRunning += groupvertex.RUNNING;
- countFinished += groupvertex.FINISHING + groupvertex.FINISHED;
+ countFinished += groupvertex.FINISHED;
countCanceled += groupvertex.CANCELING + groupvertex.CANCELED;
countFailed += groupvertex.FAILED;
jobtable += "<tr>\
@@ -209,7 +209,7 @@ function fillTable(table, json) {
<td class=\"nummembers\">"+ groupvertex.numberofgroupmembers+ "</td>";
jobtable += progressBar(groupvertex.numberofgroupmembers, starting, 'starting');
jobtable += progressBar(groupvertex.numberofgroupmembers, groupvertex.RUNNING, 'running');
- jobtable += progressBar(groupvertex.numberofgroupmembers, (groupvertex.FINISHING + groupvertex.FINISHED), 'success finished');
+ jobtable += progressBar(groupvertex.numberofgroupmembers, (groupvertex.FINISHED), 'success finished');
jobtable += progressBar(groupvertex.numberofgroupmembers, (groupvertex.CANCELING + groupvertex.CANCELED), 'warning canceled');
jobtable += progressBar(groupvertex.numberofgroupmembers, groupvertex.FAILED, 'danger failed');
jobtable += "</tr><tr>\
@@ -304,18 +304,14 @@ function updateTable(json) {
{
// not very nice
var oldstatus = ""+$("#"+event.vertexid).children(".status").html();
- if(oldstatus == "CREATED" || oldstatus == "SCHEDULED" ||oldstatus == "ASSIGNED" ||oldstatus == "READY" ||oldstatus == "STARTING")
+ if (oldstatus == "CREATED" || oldstatus == "SCHEDULED" || oldstatus == "DEPLOYING")
oldstatus = "starting";
- else if(oldstatus == "FINISHING")
- oldstatus = "finished";
else if(oldstatus == "CANCELING")
oldstatus = "canceled";
var newstate = event.newstate;
- if(newstate == "CREATED" || newstate == "SCHEDULED" ||newstate == "ASSIGNED" ||newstate == "READY" ||newstate == "STARTING")
+ if(newstate == "CREATED" || newstate == "SCHEDULED" || newstate == "DEPLOYING")
newstate = "starting";
- else if(newstate == "FINISHING")
- newstate = "finished";
else if(newstate == "CANCELING")
newstate = "canceled";
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/3e644000/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JsonFactory.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JsonFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JsonFactory.java
index 6ac8613..dc1d60a 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JsonFactory.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JsonFactory.java
@@ -77,7 +77,7 @@ public class JsonFactory {
}
// Increment state status count
- Integer count = stateCounts.get(vertex.getExecutionState()) + new Integer(1);
+ int count = stateCounts.get(vertex.getExecutionState()) + 1;
stateCounts.put(vertex.getExecutionState(), count);
}
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/3e644000/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/CoLocationConstraintITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/CoLocationConstraintITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/CoLocationConstraintITCase.java
index 605c49f..8ef76d6 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/CoLocationConstraintITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/CoLocationConstraintITCase.java
@@ -89,8 +89,6 @@ public class CoLocationConstraintITCase {
if (eg != null) {
eg.waitForJobEnd();
assertEquals(JobStatus.FINISHED, eg.getState());
-
- assertEquals(0, eg.getRegisteredExecutions().size());
}
else {
// already done, that was fast;