Reworked the EventCollector and the ArchiveListener as actors.

Replacing the EventCollector and the MemoryArchivist. Finished EventCollector and adjusted ExecutionGraph and ExecutionVertex to register actors as listeners.
nderraugh · Dec 18, 2014 · 4f841fc · 4f841fc
1 parent 1e74b4c
commit 4f841fc
Show file tree

Hide file tree

Showing 72 changed files with 3,133 additions and 576 deletions.
diff --git a/deploysettings.xml b/deploysettings.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
 <settings xmlns="http:https://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
  xsi:schemaLocation="http:https://maven.apache.org/SETTINGS/1.0.0
  http:https://maven.apache.org/xsd/settings-1.0.0.xsd">
  <servers>

diff --git a/flink-addons/flink-avro/pom.xml b/flink-addons/flink-avro/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
 
  xsi:schemaLocation="http:https://maven.apache.org/POM/4.0.0 http:https://maven.apache.org/maven-v4_0_0.xsd">
 

diff --git a/flink-addons/flink-hadoop-compatibility/pom.xml b/flink-addons/flink-hadoop-compatibility/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
 
  xsi:schemaLocation="http:https://maven.apache.org/POM/4.0.0 http:https://maven.apache.org/maven-v4_0_0.xsd">
 

diff --git a/flink-addons/flink-hbase/pom.xml b/flink-addons/flink-hbase/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
  xsi:schemaLocation="http:https://maven.apache.org/POM/4.0.0 http:https://maven.apache.org/maven-v4_0_0.xsd">
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/flink-addons/flink-jdbc/pom.xml b/flink-addons/flink-jdbc/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
 
  xsi:schemaLocation="http:https://maven.apache.org/POM/4.0.0 http:https://maven.apache.org/maven-v4_0_0.xsd">
 

diff --git a/flink-addons/flink-spargel/pom.xml b/flink-addons/flink-spargel/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
  xsi:schemaLocation="http:https://maven.apache.org/POM/4.0.0 http:https://maven.apache.org/maven-v4_0_0.xsd">
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
  xsi:schemaLocation="http:https://maven.apache.org/POM/4.0.0 http:https://maven.apache.org/maven-v4_0_0.xsd">
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/flink-addons/flink-streaming/flink-streaming-core/pom.xml b/flink-addons/flink-streaming/flink-streaming-core/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
  xsi:schemaLocation="http:https://maven.apache.org/POM/4.0.0 http:https://maven.apache.org/maven-v4_0_0.xsd">
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/flink-addons/flink-streaming/flink-streaming-examples/pom.xml b/flink-addons/flink-streaming/flink-streaming-examples/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
  xsi:schemaLocation="http:https://maven.apache.org/POM/4.0.0 http:https://maven.apache.org/maven-v4_0_0.xsd">
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/flink-addons/flink-streaming/pom.xml b/flink-addons/flink-streaming/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
  xsi:schemaLocation="http:https://maven.apache.org/POM/4.0.0 http:https://maven.apache.org/maven-v4_0_0.xsd">
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/flink-addons/flink-yarn/pom.xml b/flink-addons/flink-yarn/pom.xml
@@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
  xsi:schemaLocation="http:https://maven.apache.org/POM/4.0.0 http:https://maven.apache.org/maven-v4_0_0.xsd">
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/flink-addons/pom.xml b/flink-addons/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
  xsi:schemaLocation="http:https://maven.apache.org/POM/4.0.0 http:https://maven.apache.org/maven-v4_0_0.xsd">
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/flink-clients/pom.xml b/flink-clients/pom.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 
 -->
-<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
  xsi:schemaLocation="http:https://maven.apache.org/POM/4.0.0 http:https://maven.apache.org/maven-v4_0_0.xsd">
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/flink-clients/src/main/java/org/apache/flink/client/minicluster/NepheleMiniCluster.java b/flink-clients/src/main/java/org/apache/flink/client/minicluster/NepheleMiniCluster.java
@@ -32,14 +32,15 @@
 import org.apache.flink.runtime.instance.LocalInstanceManager;
 import org.apache.flink.runtime.jobgraph.JobGraph;
 import org.apache.flink.runtime.jobmanager.JobManager;
-import org.apache.flink.runtime.messages.JobmanagerMessages;
+import org.apache.flink.runtime.messages.JobManagerMessages;
 import org.apache.flink.runtime.taskmanager.TaskManager;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.flink.runtime.util.EnvironmentInformation;
 import scala.concurrent.Await;
 import scala.concurrent.Future;
 
@@ -225,8 +226,7 @@ public void start() throws Exception {
  Configuration configuration = GlobalConfiguration.getConfiguration();
 
  // start the job manager
- jobManager = JobManager.startActorSystemAndActor("flink", HOSTNAME, jobManagerRpcPort, "jobmanager",
- configuration);
+ jobManager = JobManager.startActorSystemAndActor(HOSTNAME, jobManagerRpcPort, configuration);
 
  int tmRPCPort = GlobalConfiguration.getInteger(ConfigConstants.TASK_MANAGER_IPC_PORT_KEY,
  ConfigConstants.DEFAULT_TASK_MANAGER_IPC_PORT);
@@ -237,8 +237,7 @@ public void start() throws Exception {
  Configuration tmConfiguration = GlobalConfiguration.getConfiguration();
  tmConfiguration.setInteger(ConfigConstants.TASK_MANAGER_IPC_PORT_KEY, tmRPCPort + i);
  tmConfiguration.setInteger(ConfigConstants.TASK_MANAGER_DATA_PORT_KEY, tmDataPort + i);
- ActorSystem taskManager = TaskManager.startActorSystemAndActor("flink", HOSTNAME, tmRPCPort+i,
- "taskmanager" + (i+1), configuration);
+ ActorSystem taskManager = TaskManager.startActorSystemAndActor(HOSTNAME, tmRPCPort+i, configuration);
  taskManagers.add(taskManager);
  }
 
@@ -275,19 +274,22 @@ public TaskManager[] getTaskManagers() {
  // ------------------------------------------------------------------------
 
  private void waitForJobManagerToBecomeReady(int numTaskManagers) throws Exception {
+ LOG.debug("Wait until " + numTaskManagers + " task managers are ready.");
  boolean notReady = true;
 
- ActorSelection jobmanagerSelection = jobManager.actorSelection("jobmanager");
  Timeout timeout = new Timeout(1L, TimeUnit.MINUTES);
+ ActorSelection jobManagerSelection = jobManager.actorSelection("/user/jobmanager");
 
  while(notReady){
- Future<Object> futureNumTaskManagers = Patterns.ask(jobmanagerSelection,
- JobmanagerMessages.RequestNumberRegisteredTaskManager$.MODULE$, timeout);
+ Future<Object> futureNumTaskManagers = Patterns.ask(jobManagerSelection,
+ JobManagerMessages.RequestNumberRegisteredTaskManager$.MODULE$, timeout);
 
  int numRegisteredTaskManagers = (Integer)Await.result(futureNumTaskManagers, timeout.duration());
 
+ LOG.debug("Number of registered task manager: " + numRegisteredTaskManagers);
+
  if(numRegisteredTaskManagers < numTaskManagers){
- Thread.sleep(50);
+ Thread.sleep(500);
  }
 
  // make sure that not just the jobmanager has the slots, but also the taskmanager

diff --git a/flink-compiler/pom.xml b/flink-compiler/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
  xsi:schemaLocation="http:https://maven.apache.org/POM/4.0.0 http:https://maven.apache.org/maven-v4_0_0.xsd">
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/flink-core/pom.xml b/flink-core/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
  xsi:schemaLocation="http:https://maven.apache.org/POM/4.0.0 http:https://maven.apache.org/maven-v4_0_0.xsd">
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/OperatorInformation.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/OperatorInformation.java
@@ -17,39 +17,132 @@
  */
 
 
+import java.io.File
+import java.net.InetAddress
+
 import akka.actor._
-import org.apache.flink.configuration.Configuration
+import org.apache.flink.configuration.{ConfigConstants, GlobalConfiguration, Configuration}
+import org.apache.flink.runtime.ActorLogMessages
 import org.apache.flink.runtime.akka.AkkaUtils
-import org.apache.flink.runtime.messages.JobmanagerMessages.RequestNumberRegisteredTaskManager
+import org.apache.flink.runtime.executiongraph.{ExecutionGraph}
+import org.apache.flink.runtime.instance.{InstanceManager}
+import org.apache.flink.runtime.jobgraph.JobID
+import org.apache.flink.runtime.jobmanager.accumulators.AccumulatorManager
+import org.apache.flink.runtime.jobmanager.scheduler.DefaultScheduler
+import org.apache.flink.runtime.messages.EventCollectorMessages.RegisterArchiveListener
+import org.apache.flink.runtime.messages.JobManagerMessages.{CancelJob, SubmitJob, RequestNumberRegisteredTaskManager}
 import org.apache.flink.runtime.messages.RegistrationMessages._
+import org.apache.flink.runtime.messages.TaskManagerMessages.Heartbeat
+import org.apache.flink.runtime.profiling.ProfilingUtils
+import org.apache.flink.runtime.profiling.impl.JobManagerProfilerImpl
+import org.slf4j.LoggerFactory
+
+class JobManager(archiveCount: Int, profiling: Boolean, recommendedPollingInterval: Int) extends Actor with
+ActorLogMessages with ActorLogging {
+
+ val profiler = if(profiling){
+ new JobManagerProfilerImpl(InetAddress.getByName(self.path.address.host.getOrElse("localhost")))
+ }else{
+ null
+ }
+
+ // will be removed
+ val archive = context.actorOf(Props(classOf[MemoryArchivist], archiveCount), "archive")
+ val eventCollector = context.actorOf(Props(classOf[EventCollector], recommendedPollingInterval), "eventcollector")
+
+
+ val accumulatorManager = new AccumulatorManager(Math.min(1, archiveCount))
+ val instanceManager = new InstanceManager()
+ val scheduler = new DefaultScheduler()
+ val webserver = null
 
-import scala.collection.mutable
+ val currentJobs = scala.collection.concurrent.TrieMap[JobID, ExecutionGraph]()
 
-class JobManager extends Actor with ActorLogging {
+ eventCollector ! RegisterArchiveListener(archive)
 
- val taskManagers = new mutable.HashSet[ActorRef]()
+ instanceManager.addInstanceListener(scheduler)
 
- override def receive: Receive = {
- case RegisterTaskManager(hardwareInformation) =>
+ override def postStop(): Unit = {
+ instanceManager.shutdown()
+ scheduler.shutdown()
+ }
+
+ override def receiveWithLogMessages: Receive = {
+ case RegisterTaskManager(hardwareInformation, numberOfSlots) =>
  val taskManager = sender()
- taskManagers += taskManager
+ val instanceID = instanceManager.registerTaskManager(taskManager, hardwareInformation, numberOfSlots)
  context.watch(taskManager);
- taskManager ! AcknowledgeRegistration
+ taskManager ! AcknowledgeRegistration(instanceID)
 
  case RequestNumberRegisteredTaskManager =>
- sender() ! taskManagers.size
+ sender() ! instanceManager.getNumberOfRegisteredTaskManagers
+
+ case SubmitJob(jobGraph) =>
+
+ case CancelJob(jobID) =>
+
+ case Heartbeat(instanceID) =>
+ instanceManager.reportHeartBeat(instanceID)
+
+
  }
 }
 
 object JobManager{
- def startActorSystemAndActor(systemName: String, hostname: String, port: Int, actorName: String,
- configuration: Configuration): ActorSystem = {
- val actorSystem = AkkaUtils.createActorSystem(systemName, hostname, port, configuration)
- startActor(actorSystem, actorName)
+ val LOG = LoggerFactory.getLogger(classOf[JobManager])
+ val FAILURE_RETURN_CODE = 1
+
+ def main(args: Array[String]):Unit = {
+ val (hostname, port, configuration) = initialize(args)
+
+ val jobManagerSystem = startActorSystemAndActor(hostname, port, configuration)
+ jobManagerSystem.awaitTermination()
+ }
+
+ def initialize(args: Array[String]):(String, Int, Configuration) = {
+ val parser = new scopt.OptionParser[JobManagerCLIConfiguration]("jobmanager"){
+ head("flink jobmanager")
+ opt[String]("configDir") action { (x, c) =>
+ c.copy(configDir = x)
+ } text("Specify configuration directory.")
+ }
+
+ parser.parse(args, JobManagerCLIConfiguration()) map {
+ config =>
+ GlobalConfiguration.loadConfiguration(config.configDir)
+ val configuration = GlobalConfiguration.getConfiguration()
+ if(config.configDir != null && new File(config.configDir).isDirectory){
+ configuration.setString(ConfigConstants.FLINK_BASE_DIR_PATH_KEY, config.configDir + "/..")
+ }
+
+ val hostname = configuration.getString(ConfigConstants.JOB_MANAGER_IPC_ADDRESS_KEY, null)
+ val port = configuration.getInteger(ConfigConstants.JOB_MANAGER_IPC_PORT_KEY,
+ ConfigConstants.DEFAULT_JOB_MANAGER_IPC_PORT)
+
+ (hostname, port, configuration)
+ } getOrElse {
+ LOG.error("CLI Parsing failed. Usage: " + parser.usage)
+ sys.exit(FAILURE_RETURN_CODE)
+ }
+ }
+
+ def startActorSystemAndActor(hostname: String, port: Int, configuration: Configuration): ActorSystem = {
+ val actorSystem = AkkaUtils.createActorSystem(hostname, port, configuration)
+ startActor(actorSystem, configuration)
  actorSystem
  }
 
- def startActor(actorSystem: ActorSystem, actorName: String): ActorRef = {
- actorSystem.actorOf(Props(classOf[JobManager]), actorName)
+ def startActor(actorSystem: ActorSystem, configuration: Configuration): ActorRef = {
+ val archiveCount = configuration.getInteger(ConfigConstants.JOB_MANAGER_WEB_ARCHIVE_COUNT,
+ ConfigConstants.DEFAULT_JOB_MANAGER_WEB_ARCHIVE_COUNT)
+ val profilingEnabled = configuration.getBoolean(ProfilingUtils.PROFILE_JOB_KEY, true)
+ val recommendedPollingInterval = configuration.getInteger(ConfigConstants.JOBCLIENT_POLLING_INTERVAL_KEY,
+ ConfigConstants.DEFAULT_JOBCLIENT_POLLING_INTERVAL)
+
+ actorSystem.actorOf(Props(classOf[JobManager], archiveCount, profilingEnabled, recommendedPollingInterval), "jobmanager")
+ }
+
+ def getAkkaURL(address: String): String = {
+ s"akka.tcp://flink@${address}/user/jobmanager"
  }
 }
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http:https://maven.apache.org/POM/4.0.0" xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
  xsi:schemaLocation="http:https://maven.apache.org/POM/4.0.0 http:https://maven.apache.org/maven-v4_0_0.xsd">
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml
@@ -18,7 +18,7 @@ under the License.
 -->
 <assembly
  xmlns="http:https://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
  xsi:schemaLocation="http:https://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http:https://maven.apache.org/xsd/assembly-1.1.0.xsd">
  <id>bin</id>
  <formats>

diff --git a/flink-dist/src/main/assemblies/yarn-uberjar.xml b/flink-dist/src/main/assemblies/yarn-uberjar.xml
@@ -18,7 +18,7 @@ under the License.
 -->
 
 <assembly xmlns="http:https://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
  xsi:schemaLocation="http:https://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http:https://maven.apache.org/xsd/assembly-1.1.0.xsd">
 
  <!-- Note: This file has been copied and adapted from: http:https://maven.apache.org/plugins/maven-assembly-plugin/descriptor-refs.html#jar-with-dependencies -->

diff --git a/flink-dist/src/main/assemblies/yarn.xml b/flink-dist/src/main/assemblies/yarn.xml
@@ -19,7 +19,7 @@ under the License.
 
 <assembly
  xmlns="http:https://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-taskManager"
  xsi:schemaLocation="http:https://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http:https://maven.apache.org/xsd/assembly-1.1.0.xsd">
  <id>yarn</id>
  <formats>

diff --git a/flink-dist/src/main/flink-bin/bin/config.sh b/flink-dist/src/main/flink-bin/bin/config.sh
@@ -191,7 +191,7 @@ JVM_ARGS=""
 CLASSPATH=`manglePathList $( echo $FLINK_LIB_DIR/*.jar . | sed 's/ /:/g' )`
 
 # Auxilliary function which extracts the name of host from a line which
-# also potentialy includes topology information and the instance type
+# also potentialy includes topology information and the taskManager type
 extractHostName() {
  # extract first part of string (before any whitespace characters)
  SLAVE=$1