diff options
author | scwf <wangfei1@huawei.com> | 2014-10-02 17:47:56 -0700 |
---|---|---|
committer | Andrew Or <andrewor14@gmail.com> | 2014-10-02 17:49:41 -0700 |
commit | 16789f62aac8bb88e7c3308e4c9f34511d1698a1 (patch) | |
tree | 75e91767df0c24aa2196b56f89825ccacc5571d5 /core/src/main | |
parent | 68693519ea6b08de39d50ddd84e24fb762a3a44d (diff) | |
download | spark-16789f62aac8bb88e7c3308e4c9f34511d1698a1.tar.gz spark-16789f62aac8bb88e7c3308e4c9f34511d1698a1.tar.bz2 spark-16789f62aac8bb88e7c3308e4c9f34511d1698a1.zip |
[SPARK-3755][Core] avoid trying privileged port when request a non-privileged port
pwendell, ```tryPort``` is not compatible with old code in last PR, this is to fix it.
And after discuss with srowen renamed the title to "avoid trying privileged port when request a non-privileged port". Plz refer to the discuss for detail.
Author: scwf <wangfei1@huawei.com>
Closes #2623 from scwf/1-1024 and squashes the following commits:
10a4437 [scwf] add comment
de3fd17 [scwf] do not try privileged port when request a non-privileged port
42cb0fa [scwf] make tryPort compatible with old code
cb8cc76 [scwf] do not use port 1 - 1024
(cherry picked from commit 8081ce8bd111923db143abc55bb6ef9793eece35)
Signed-off-by: Andrew Or <andrewor14@gmail.com>
Conflicts:
core/src/main/scala/org/apache/spark/util/Utils.scala
Diffstat (limited to 'core/src/main')
-rw-r--r-- | core/src/main/scala/org/apache/spark/util/Utils.scala | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala b/core/src/main/scala/org/apache/spark/util/Utils.scala index 285bce005d..3f0a80b956 100644 --- a/core/src/main/scala/org/apache/spark/util/Utils.scala +++ b/core/src/main/scala/org/apache/spark/util/Utils.scala @@ -1458,7 +1458,12 @@ private[spark] object Utils extends Logging { val serviceString = if (serviceName.isEmpty) "" else s" '$serviceName'" for (offset <- 0 to maxRetries) { // Do not increment port if startPort is 0, which is treated as a special port - val tryPort = if (startPort == 0) startPort else (startPort + offset) % (65536 - 1024) + 1024 + val tryPort = if (startPort == 0) { + startPort + } else { + // If the new port wraps around, do not try a privilege port + ((startPort + offset - 1024) % (65536 - 1024)) + 1024 + } try { val (service, port) = startService(tryPort) logInfo(s"Successfully started service$serviceString on port $port.") |