Repository: flink Updated Branches: refs/heads/master 7d6df2e60 -> f78339faa
Change FlinkMiniCluster#HOSTNAME to FlinkMiniCluster#hostname to match naming convention. The FlinkMiniCluster contain member variable called HOSTNAME which all caps. The naming of al caps usually reserved for constants and static variable. The PR is changing the name of the variable and the usages. Author: hsaputra <hsapu...@apache.org> Closes #711 from hsaputra/update_hostname_to_match_conventions and squashes the following commits: 2a2f3bd [hsaputra] Change FlinkMiniCluster#HOSTNAME to FlinkMiniCluster#hostname to match naming convention. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f78339fa Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f78339fa Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f78339fa Branch: refs/heads/master Commit: f78339faac4e17ca4e26eceeb0e68eb73e7cd549 Parents: 7d6df2e Author: hsaputra <hsapu...@apache.org> Authored: Tue May 26 10:43:26 2015 -0700 Committer: hsaputra <hsapu...@apache.org> Committed: Tue May 26 10:43:26 2015 -0700 ---------------------------------------------------------------------- .../apache/flink/runtime/minicluster/FlinkMiniCluster.scala | 6 +++--- .../flink/runtime/minicluster/LocalFlinkMiniCluster.scala | 4 ++-- .../org/apache/flink/runtime/testingUtils/TestingCluster.scala | 2 +- .../org/apache/flink/test/util/ForkableFlinkMiniCluster.scala | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/f78339fa/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/FlinkMiniCluster.scala ---------------------------------------------------------------------- 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 edc12a1..73a37de 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 @@ -63,7 +63,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) @@ -107,7 +107,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))) } } @@ -122,7 +122,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 = { http://git-wip-us.apache.org/repos/asf/flink/blob/f78339fa/flink-runtime/src/main/scala/org/apache/flink/runtime/minicluster/LocalFlinkMiniCluster.scala ---------------------------------------------------------------------- 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 663307d..424ee4c 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 @@ -119,7 +119,7 @@ class LocalFlinkMiniCluster(userConfiguration: Configuration, } 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? @@ -221,7 +221,7 @@ class LocalFlinkMiniCluster(userConfiguration: Configuration, 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) http://git-wip-us.apache.org/repos/asf/flink/blob/f78339fa/flink-runtime/src/test/scala/org/apache/flink/runtime/testingUtils/TestingCluster.scala ---------------------------------------------------------------------- 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 a904f60..11e93d6 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 @@ -85,7 +85,7 @@ class TestingCluster(userConfiguration: Configuration, } TaskManager.startTaskManagerComponentsAndActor(configuration, system, - HOSTNAME, + hostname, Some(tmActorName), jobManagerPath, numTaskManagers == 1, http://git-wip-us.apache.org/repos/asf/flink/blob/f78339fa/flink-test-utils/src/main/scala/org/apache/flink/test/util/ForkableFlinkMiniCluster.scala ---------------------------------------------------------------------- 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 762d77e..796ea09 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 @@ -125,7 +125,7 @@ class ForkableFlinkMiniCluster(userConfiguration: Configuration, None } - TaskManager.startTaskManagerComponentsAndActor(config, system, HOSTNAME, + TaskManager.startTaskManagerComponentsAndActor(config, system, hostname, Some(TaskManager.TASK_MANAGER_NAME + index), jobManagerAkkaUrl, localExecution, streamingMode, classOf[TestingTaskManager]) }
