From 2a2f3bd9f9e6edab44f3c1de76952bd62b12680d Mon Sep 17 00:00:00 2001 From: hsaputra Date: Thu, 21 May 2015 10:31:39 -0700 Subject: [PATCH] Change FlinkMiniCluster#HOSTNAME to FlinkMiniCluster#hostname to match naming convention. --- .../apache/flink/runtime/minicluster/FlinkMiniCluster.scala | 6 +++--- .../flink/runtime/minicluster/LocalFlinkMiniCluster.scala | 4 ++-- .../apache/flink/runtime/testingUtils/TestingCluster.scala | 2 +- .../apache/flink/test/util/ForkableFlinkMiniCluster.scala | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala index 8a6c39461e4b6..ec54dc64746cb 100644 --- a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala +++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala @@ -56,7 +56,7 @@ abstract class FlinkMiniCluster(val userConfiguration: Configuration, // NOTE: THIS MUST BE getByName("localhost"), which is 127.0.0.1 and // not getLocalHost(), which may be 127.0.1.1 - val HOSTNAME = InetAddress.getByName("localhost").getHostAddress() + val hostname = InetAddress.getByName("localhost").getHostAddress() val timeout = AkkaUtils.getTimeout(userConfiguration) @@ -100,7 +100,7 @@ abstract class FlinkMiniCluster(val userConfiguration: Configuration, val port = configuration.getInteger(ConfigConstants.JOB_MANAGER_IPC_PORT_KEY, ConfigConstants.DEFAULT_JOB_MANAGER_IPC_PORT) - AkkaUtils.getAkkaConfig(configuration, Some((HOSTNAME, port))) + AkkaUtils.getAkkaConfig(configuration, Some((hostname, port))) } } @@ -115,7 +115,7 @@ abstract class FlinkMiniCluster(val userConfiguration: Configuration, val resolvedPort = if(port != 0) port + index else port - AkkaUtils.getAkkaConfig(configuration, Some((HOSTNAME, resolvedPort))) + AkkaUtils.getAkkaConfig(configuration, Some((hostname, resolvedPort))) } def startTaskManagerActorSystem(index: Int): ActorSystem = { diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala index e2d7cc18c3884..a4e7b793d3cd7 100644 --- a/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala +++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala @@ -105,7 +105,7 @@ class LocalFlinkMiniCluster(userConfiguration: Configuration, singleActorSystem: } TaskManager.startTaskManagerComponentsAndActor(config, system, - HOSTNAME, // network interface to bind to + hostname, // network interface to bind to Some(taskManagerActorName), // actor name jobManagerPath, // job manager akka URL localExecution, // start network stack? @@ -206,7 +206,7 @@ class LocalFlinkMiniCluster(userConfiguration: Configuration, singleActorSystem: def getDefaultConfig: Configuration = { val config: Configuration = new Configuration() - config.setString(ConfigConstants.JOB_MANAGER_IPC_ADDRESS_KEY, HOSTNAME) + config.setString(ConfigConstants.JOB_MANAGER_IPC_ADDRESS_KEY, hostname) config.setInteger(ConfigConstants.LOCAL_INSTANCE_MANAGER_NUMBER_TASK_MANAGER, 1) diff --git a/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingCluster.scala b/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingCluster.scala index 9f9fe93177731..8aaf5f1674c1f 100644 --- a/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingCluster.scala +++ b/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingCluster.scala @@ -74,7 +74,7 @@ class TestingCluster(userConfiguration: Configuration, singleActorSystem: Boolea } TaskManager.startTaskManagerComponentsAndActor(configuration, system, - HOSTNAME, + hostname, Some(tmActorName), jobManagerPath, numTaskManagers == 1, diff --git a/flink-test-utils/src/main/scala/org/apache/flink/test/util/ForkableFlinkMiniCluster.scala b/flink-test-utils/src/main/scala/org/apache/flink/test/util/ForkableFlinkMiniCluster.scala index 05093b51a7234..30fb48479a605 100644 --- a/flink-test-utils/src/main/scala/org/apache/flink/test/util/ForkableFlinkMiniCluster.scala +++ b/flink-test-utils/src/main/scala/org/apache/flink/test/util/ForkableFlinkMiniCluster.scala @@ -116,7 +116,7 @@ class ForkableFlinkMiniCluster(userConfiguration: Configuration, singleActorSyst None } - TaskManager.startTaskManagerComponentsAndActor(config, system, HOSTNAME, + TaskManager.startTaskManagerComponentsAndActor(config, system, hostname, Some(TaskManager.TASK_MANAGER_NAME + index), jobManagerAkkaUrl, localExecution, classOf[TestingTaskManager]) }