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 2015/01/18 20:03:21 UTC

[15/17] flink git commit: [FLINK-1229][FLINK-1206] [web frontend] Synchronize webclient arguments with command line and add default parallelism.

[FLINK-1229][FLINK-1206] [web frontend] Synchronize webclient arguments with command line and add default parallelism.

This closes #291


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

Branch: refs/heads/master
Commit: d3072ba57877a95001d6c210ec0f156b478619fb
Parents: 9cd96df
Author: mingliang <qm...@gmail.com>
Authored: Wed Jan 7 19:49:32 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Sun Jan 18 09:58:21 2015 -0800

----------------------------------------------------------------------
 .../flink/client/web/JobSubmissionServlet.java  | 23 +++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/d3072ba5/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 84cb011..7eddb61 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
@@ -146,10 +146,21 @@ public class JobSubmissionServlet extends HttpServlet {
 			}
 
 			String assemblerClass = null;
-			if (params.size() >= 2 && params.get(0).equals("assembler")) {
-				assemblerClass = params.get(1);
-				params.remove(0);
-				params.remove(0);
+			int parallelism = -1;
+			while(params.size() >= 2) {
+				if (params.get(0).equals("-c")) {
+					assemblerClass = params.get(1);
+					params.remove(0);
+					params.remove(0);
+				}
+				else if (params.get(0).equals("-p")) {
+					parallelism = Integer.parseInt(params.get(1));
+					params.remove(0);
+					params.remove(0);
+				}
+				else {
+					break;
+				}
 			}
 
 			// create the plan
@@ -167,7 +178,7 @@ public class JobSubmissionServlet extends HttpServlet {
 				
 				client = new Client(nepheleConfig, program.getUserCodeClassLoader());
 				
-				optPlan = client.getOptimizedPlan(program, -1);
+				optPlan = client.getOptimizedPlan(program, parallelism);
 				
 				if (optPlan == null) {
 					throw new Exception("The optimized plan could not be produced.");
@@ -272,7 +283,7 @@ public class JobSubmissionServlet extends HttpServlet {
 				// don't show any plan. directly submit the job and redirect to the
 				// nephele runtime monitor
 				try {
-					client.run(program, -1, false);
+					client.run(program, parallelism, false);
 				} catch (Exception ex) {
 					LOG.error("Error submitting job to the job-manager.", ex);
 					// HACK: Is necessary because Message contains whole stack trace