You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by do...@apache.org on 2015/10/16 01:02:03 UTC
incubator-reef git commit: [REEF-798] Create a progress reporting
REST endpoint
Repository: incubator-reef
Updated Branches:
refs/heads/master b077695e5 -> 1e598fa38
[REEF-798] Create a progress reporting REST endpoint
This addressed the issue by
* Inject ProgressProvider into HttpServerReefEventHandler.
* Implement the progress endpoint.
JIRA:
[REEF-798](https://issues.apache.org/jira/browse/REEF-798)
Pull request:
This closes #544
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/1e598fa3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/1e598fa3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/1e598fa3
Branch: refs/heads/master
Commit: 1e598fa388e3766841e1a4cd17f48710efdd59f2
Parents: b077695
Author: Andrew Chung <af...@gmail.com>
Authored: Mon Oct 5 16:08:00 2015 -0700
Committer: Dongjoon Hyun <do...@apache.org>
Committed: Fri Oct 16 07:42:59 2015 +0900
----------------------------------------------------------------------
.../apache/reef/webserver/HttpServerReefEventHandler.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1e598fa3/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java
----------------------------------------------------------------------
diff --git a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java
index dfa3362..aa7dd42 100644
--- a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java
+++ b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java
@@ -18,6 +18,7 @@
*/
package org.apache.reef.webserver;
+import org.apache.reef.driver.ProgressProvider;
import org.apache.reef.driver.evaluator.EvaluatorDescriptor;
import org.apache.reef.driver.parameters.ClientCloseHandlers;
import org.apache.reef.runtime.common.files.REEFFileNames;
@@ -61,6 +62,7 @@ public final class HttpServerReefEventHandler implements HttpHandler {
private final ReefEventStateManager reefStateManager;
private final Set<EventHandler<Void>> clientCloseHandlers;
private final LoggingScopeFactory loggingScopeFactory;
+ private final ProgressProvider progressProvider;
/**
* Log level string prefix in the log lines.
@@ -78,11 +80,13 @@ public final class HttpServerReefEventHandler implements HttpHandler {
@Parameter(ClientCloseHandlers.class) final Set<EventHandler<Void>> clientCloseHandlers,
@Parameter(LogLevelName.class) final String logLevel,
final LoggingScopeFactory loggingScopeFactory,
- final REEFFileNames reefFileNames) {
+ final REEFFileNames reefFileNames,
+ final ProgressProvider progressProvider) {
this.reefStateManager = reefStateManager;
this.clientCloseHandlers = clientCloseHandlers;
this.loggingScopeFactory = loggingScopeFactory;
this.logLevelPrefix = new StringBuilder().append(logLevel).append(": ").toString();
+ this.progressProvider = progressProvider;
driverStdoutFile = reefFileNames.getDriverStdoutFileName();
driverStderrFile = reefFileNames.getDriverStderrFileName();
}
@@ -189,8 +193,9 @@ public final class HttpServerReefEventHandler implements HttpHandler {
}
}
break;
- // TODO[JIRA REEF-798] Use this provider in the HTTP
case "progress":
+ response.getWriter().println(progressProvider.getProgress());
+ break;
default:
response.getWriter().println(String.format("Unsupported query for entity: [%s].", target));
}