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/03/17 10:16:28 UTC

[8/8] flink git commit: [FLINK-1671] [jobmanager] Rename JobManager's ExecutionMode to JobManagerMode

[FLINK-1671] [jobmanager] Rename JobManager's ExecutionMode to JobManagerMode

This is done to avoid name conflicts with the overloaded type name ExecutionMode.


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

Branch: refs/heads/master
Commit: 361c90a847d8da3f5bcae4efb4fdc3b83a9cdcf1
Parents: 3b579ad
Author: Stephan Ewen <se...@apache.org>
Authored: Tue Mar 10 18:22:20 2015 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue Mar 17 10:10:08 2015 +0100

----------------------------------------------------------------------
 .../runtime/jobmanager/JobManagerMode.java      | 37 ++++++++++++++++++++
 .../flink/runtime/jobmanager/JobManager.scala   | 31 ++++++++++------
 .../jobmanager/JobManagerCLIConfiguration.scala | 16 ++++-----
 .../JobManagerProcessReapingTest.java           |  2 +-
 .../jobmanager/JobManagerStartupTest.java       |  4 +--
 5 files changed, 68 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/361c90a8/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerMode.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerMode.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerMode.java
new file mode 100644
index 0000000..201176b
--- /dev/null
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/JobManagerMode.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.runtime.jobmanager;
+
+/**
+ * The startup mode for the JobManager.
+ */
+public enum JobManagerMode {
+
+	/**
+	 * Causes the JobManager to operate in single user mode and
+	 * start a local embedded TaskManager.
+	 */
+	LOCAL,
+
+	/**
+	 * Starts the JobManager in the regular mode where it waits for external TaskManagers
+	 * to connect.
+	 */
+	CLUSTER
+}

http://git-wip-us.apache.org/repos/asf/flink/blob/361c90a8/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
index c350680..98dd7eb 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
@@ -629,8 +629,6 @@ class JobManager(val configuration: Configuration,
  * look up the JobManager actor reference.
  */
 object JobManager {
-  
-  import ExecutionMode._
 
   val LOG = LoggerFactory.getLogger(classOf[JobManager])
 
@@ -656,7 +654,7 @@ object JobManager {
 
     // parsing the command line arguments
     val (configuration: Configuration,
-         executionMode: ExecutionMode,
+         executionMode: JobManagerMode,
          listeningHost: String, listeningPort: Int) =
     try {
       parseArgs(args)
@@ -717,7 +715,7 @@ object JobManager {
    * @param listeningPort The port where the JobManager should listen for messages.
    */
   def runJobManager(configuration: Configuration,
-                    executionMode: ExecutionMode,
+                    executionMode: JobManagerMode,
                     listeningAddress: String,
                     listeningPort: Int) : Unit = {
 
@@ -761,7 +759,7 @@ object JobManager {
         "JobManager_Process_Reaper")
 
       // bring up a local task manager, if needed
-      if (executionMode.equals(LOCAL)) {
+      if (executionMode == JobManagerMode.LOCAL) {
         LOG.info("Starting embedded TaskManager for JobManager's LOCAL execution mode")
 
         TaskManager.startTaskManagerActor(configuration, jobManagerSystem, listeningAddress,
@@ -798,18 +796,29 @@ object JobManager {
    * @param args command line arguments
    * @return Quadruple of configuration, execution mode and an optional listening address
    */
-  def parseArgs(args: Array[String]): (Configuration, ExecutionMode, String, Int) = {
+  def parseArgs(args: Array[String]): (Configuration, JobManagerMode, String, Int) = {
     val parser = new scopt.OptionParser[JobManagerCLIConfiguration]("JobManager") {
       head("Flink JobManager")
+
       opt[String]("configDir") action { (arg, c) => c.copy(configDir = arg) } text {
         "The configuration directory." }
+
       opt[String]("executionMode") action { (arg, c) =>
-        if (arg.equalsIgnoreCase("local")){
-          c.copy(executionMode = LOCAL)
-        } else if (arg.equalsIgnoreCase("cluster")) {
-          c.copy(executionMode = CLUSTER)
-        } else {
+        val argLower = arg.toLowerCase()
+        var result: JobManagerCLIConfiguration = null
+
+        for (mode <- JobManagerMode.values() if result == null) {
+          val modeName = mode.name().toLowerCase()
+
+          if (modeName.equals(argLower)) {
+            result = c.copy(executionMode = mode)
+          }
+        }
+
+        if (result == null) {
           throw new Exception("Unknown execution mode: " + arg)
+        } else {
+          result
         }
       } text {
         "The execution mode of the JobManager (CLUSTER / LOCAL)"

http://git-wip-us.apache.org/repos/asf/flink/blob/361c90a8/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManagerCLIConfiguration.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManagerCLIConfiguration.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManagerCLIConfiguration.scala
index 905dbe3..4cd02c5 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManagerCLIConfiguration.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManagerCLIConfiguration.scala
@@ -18,11 +18,11 @@
 
 package org.apache.flink.runtime.jobmanager
 
-object ExecutionMode extends Enumeration{
-  type ExecutionMode = Value
-  val LOCAL = Value
-  val CLUSTER = Value
-}
-
-case class JobManagerCLIConfiguration(configDir: String = null, 
-          executionMode: ExecutionMode.ExecutionMode = null) {}
+/**
+ * Holder for command line parameters of the JobManager.
+ *
+ * @param configDir The directory to load the configuration from.
+ * @param executionMode Mode for the JobManager.
+ */
+case class JobManagerCLIConfiguration(configDir: String = null,
+                                      executionMode: JobManagerMode = null) {}

http://git-wip-us.apache.org/repos/asf/flink/blob/361c90a8/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerProcessReapingTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerProcessReapingTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerProcessReapingTest.java
index e1f9b4a..eee945a 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerProcessReapingTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerProcessReapingTest.java
@@ -183,7 +183,7 @@ public class JobManagerProcessReapingTest {
 				Configuration config = new Configuration();
 				config.setInteger(ConfigConstants.JOB_MANAGER_WEB_PORT_KEY, -1);
 
-				JobManager.runJobManager(config, ExecutionMode.CLUSTER(), "localhost", port);
+				JobManager.runJobManager(config, JobManagerMode.CLUSTER, "localhost", port);
 				System.exit(0);
 			}
 			catch (Throwable t) {

http://git-wip-us.apache.org/repos/asf/flink/blob/361c90a8/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerStartupTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerStartupTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerStartupTest.java
index 4884b19..070e376 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerStartupTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerStartupTest.java
@@ -80,7 +80,7 @@ public class JobManagerStartupTest {
 		}
 		
 		try {
-			JobManager.runJobManager(new Configuration(), ExecutionMode.CLUSTER(), "localhost", portNum);
+			JobManager.runJobManager(new Configuration(), JobManagerMode.CLUSTER, "localhost", portNum);
 			fail("this should throw an exception");
 		}
 		catch (Exception e) {
@@ -117,7 +117,7 @@ public class JobManagerStartupTest {
 		failConfig.setString(ConfigConstants.BLOB_STORAGE_DIRECTORY_KEY, nonExistDirectory);
 
 		try {
-			JobManager.runJobManager(failConfig, ExecutionMode.CLUSTER(), "localhost", portNum);
+			JobManager.runJobManager(failConfig, JobManagerMode.CLUSTER, "localhost", portNum);
 			fail("this should fail with an exception");
 		}
 		catch (Exception e) {