From 724e2bd19b1ccd9238354af1c876a2d8c839f280 Mon Sep 17 00:00:00 2001 From: hongsibao Date: Thu, 19 Mar 2015 01:06:06 +0800 Subject: [PATCH 1/2] Fix the bug of the jobManager and TaskManager IPC Port Check. --- .../org/apache/flink/runtime/jobmanager/JobManager.scala | 8 ++++++++ .../apache/flink/runtime/taskmanager/TaskManager.scala | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) 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 98dd7eb11390e..1ac3289c3ab7c 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 @@ -677,6 +677,14 @@ object JobManager { System.exit(STARTUP_FAILURE_RETURN_CODE) } + // address and will not be reachable from anyone remote + if (listeningPort <= 0 || listeningPort >= 65536) { + val message = "Config parameter '" + ConfigConstants.JOB_MANAGER_IPC_PORT_KEY + + "' is invalid, it must be great than 0 and less than 65536." + LOG.error(message) + System.exit(STARTUP_FAILURE_RETURN_CODE) + } + // run the job manager try { if (SecurityUtils.isSecurityEnabled) { diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala index 53c45ceb1ad15..68cb8084193d1 100644 --- a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala +++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala @@ -1274,9 +1274,10 @@ object TaskManager { "' is missing (hostname/address of JobManager to connect to).") } - if (port <= 0) { + if (port <= 0 || port >= 65535) { throw new Exception("Invalid value for '" + ConfigConstants.JOB_MANAGER_IPC_PORT_KEY + - "' (port of the JobManager actor system) : " + port) + "' (port of the JobManager actor system) : " + port + + ". it must be great than 0 and less than 65536.") } (hostname, port) From 84e3dbb92dbf807b35f0552a37ca57e4e65049db Mon Sep 17 00:00:00 2001 From: hongsibao Date: Thu, 19 Mar 2015 02:59:35 +0800 Subject: [PATCH 2/2] Fix the bug of JobManager and TaskManager Port Check. --- .../org/apache/flink/runtime/taskmanager/TaskManager.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala index 68cb8084193d1..8ef6c5726acc0 100644 --- a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala +++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala @@ -1274,7 +1274,7 @@ object TaskManager { "' is missing (hostname/address of JobManager to connect to).") } - if (port <= 0 || port >= 65535) { + if (port <= 0 || port >= 65536) { throw new Exception("Invalid value for '" + ConfigConstants.JOB_MANAGER_IPC_PORT_KEY + "' (port of the JobManager actor system) : " + port + ". it must be great than 0 and less than 65536.")