Return-Path: X-Original-To: apmail-flink-commits-archive@minotaur.apache.org Delivered-To: apmail-flink-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A2880119A8 for ; Fri, 15 Aug 2014 11:53:29 +0000 (UTC) Received: (qmail 2912 invoked by uid 500); 15 Aug 2014 11:53:29 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 2891 invoked by uid 500); 15 Aug 2014 11:53:29 -0000 Mailing-List: contact commits-help@flink.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.incubator.apache.org Delivered-To: mailing list commits@flink.incubator.apache.org Received: (qmail 2882 invoked by uid 99); 15 Aug 2014 11:53:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Aug 2014 11:53:29 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 15 Aug 2014 11:53:06 +0000 Received: (qmail 1160 invoked by uid 99); 15 Aug 2014 11:53:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Aug 2014 11:53:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6EBE39C4DD6; Fri, 15 Aug 2014 11:53:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rmetzger@apache.org To: commits@flink.incubator.apache.org Message-Id: <0a1b47aedb7741c9b13b779b5d815f62@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: [FLINK-1054] Fix job history view in web frontend Date: Fri, 15 Aug 2014 11:53:04 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-flink Updated Branches: refs/heads/release-0.6 87dd7c7fb -> a05c56748 [FLINK-1054] Fix job history view in web frontend Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/a05c5674 Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/a05c5674 Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/a05c5674 Branch: refs/heads/release-0.6 Commit: a05c567481b51210319bc950f27808cf921c4ee8 Parents: 87dd7c7 Author: Robert Metzger Authored: Fri Aug 15 13:51:06 2014 +0200 Committer: Robert Metzger Committed: Fri Aug 15 13:51:06 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/flink/runtime/jobmanager/JobManager.java | 5 +++++ .../flink/runtime/jobmanager/web/JobmanagerInfoServlet.java | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/a05c5674/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java index be0bb48..8ef6b58 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManager.java @@ -44,6 +44,7 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.flink.api.common.accumulators.Accumulator; import org.apache.flink.configuration.ConfigConstants; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.GlobalConfiguration; @@ -1196,4 +1197,8 @@ public class JobManager implements DeploymentManager, ExtendedManagementProtocol public AccumulatorEvent getAccumulatorResults(JobID jobID) throws IOException { return new AccumulatorEvent(jobID, this.accumulatorManager.getJobAccumulators(jobID)); } + + public Map> getAccumulators(JobID jobID) { + return this.accumulatorManager.getJobAccumulators(jobID); + } } http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/a05c5674/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 3aa17bf..386315f 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 @@ -36,13 +36,11 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.flink.api.common.accumulators.AccumulatorHelper; -import org.apache.flink.runtime.accumulators.AccumulatorEvent; import org.apache.flink.runtime.event.job.AbstractEvent; import org.apache.flink.runtime.event.job.ExecutionStateChangeEvent; import org.apache.flink.runtime.event.job.JobEvent; import org.apache.flink.runtime.event.job.RecentJobEvent; import org.apache.flink.runtime.execution.ExecutionState; -import org.apache.flink.runtime.execution.librarycache.LibraryCacheManager; import org.apache.flink.runtime.jobgraph.JobID; import org.apache.flink.runtime.jobgraph.JobStatus; import org.apache.flink.runtime.jobmanager.JobManager; @@ -291,8 +289,7 @@ public class JobmanagerInfoServlet extends HttpServlet { wrt.write("],"); // write accumulators - AccumulatorEvent accumulators = jobmanager.getAccumulatorResults(jobEvent.getJobID()); - Map accMap = AccumulatorHelper.toResultMap(accumulators.getAccumulators(LibraryCacheManager.getClassLoader(jobEvent.getJobID()))); + Map accMap = AccumulatorHelper.toResultMap(jobmanager.getAccumulators(jobEvent.getJobID())); wrt.write("\n\"accumulators\": ["); int i = 0;