You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fh...@apache.org on 2015/10/21 14:13:35 UTC
[6/6] flink git commit: [FLINK-2820] Configuration not passed to
JobGraphGenerator
[FLINK-2820] Configuration not passed to JobGraphGenerator
This was previously reported as FLINK-2625 (commit 8a84937215ea575fa94a00d11c2517902d252756).
The Client class was concurrently refactored with FLINK-2097 (commit 71bf2f570861daae53b24bfcf1d06aedb85311b9).
This closes #1278
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/4c1cffd9
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/4c1cffd9
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/4c1cffd9
Branch: refs/heads/master
Commit: 4c1cffd9d02d9ddaaf433a1882098c8423d97c28
Parents: 6666ea5
Author: Greg Hogan <co...@greghogan.com>
Authored: Tue Oct 20 12:13:10 2015 -0400
Committer: Fabian Hueske <fh...@apache.org>
Committed: Wed Oct 21 13:41:54 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/flink/client/program/Client.java | 6 +++---
.../java/org/apache/flink/client/web/JobSubmissionServlet.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/4c1cffd9/flink-clients/src/main/java/org/apache/flink/client/program/Client.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/Client.java b/flink-clients/src/main/java/org/apache/flink/client/program/Client.java
index 322c73d..1cc1a54 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/program/Client.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/program/Client.java
@@ -521,16 +521,16 @@ public class Client {
return getOptimizedPlan(compiler, prog.getPlan(), parallelism);
}
- public static JobGraph getJobGraph(PackagedProgram prog, FlinkPlan optPlan) throws ProgramInvocationException {
+ public JobGraph getJobGraph(PackagedProgram prog, FlinkPlan optPlan) throws ProgramInvocationException {
return getJobGraph(optPlan, prog.getAllLibraries(), prog.getClasspaths());
}
- private static JobGraph getJobGraph(FlinkPlan optPlan, List<URL> jarFiles, List<URL> classpaths) {
+ private JobGraph getJobGraph(FlinkPlan optPlan, List<URL> jarFiles, List<URL> classpaths) {
JobGraph job;
if (optPlan instanceof StreamingPlan) {
job = ((StreamingPlan) optPlan).getJobGraph();
} else {
- JobGraphGenerator gen = new JobGraphGenerator();
+ JobGraphGenerator gen = new JobGraphGenerator(this.config);
job = gen.compileJobGraph((OptimizedPlan) optPlan);
}
http://git-wip-us.apache.org/repos/asf/flink/blob/4c1cffd9/flink-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java b/flink-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java
index f83b97c..472c8d5 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/web/JobSubmissionServlet.java
@@ -313,7 +313,7 @@ public class JobSubmissionServlet extends HttpServlet {
// submit the job
try {
Client client = new Client(GlobalConfiguration.getConfiguration());
- client.runDetached(Client.getJobGraph(job.f0, job.f1), job.f0.getUserCodeClassLoader());
+ client.runDetached(client.getJobGraph(job.f0, job.f1), job.f0.getUserCodeClassLoader());
}
catch (Exception ex) {
LOG.error("Error submitting job to the job-manager.", ex);