You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2018/04/24 01:10:37 UTC

spark git commit: [SPARK-24029][CORE] Follow up: set SO_REUSEADDR on the server socket.

Repository: spark
Updated Branches:
  refs/heads/master c8f3ac69d -> 428b90385


[SPARK-24029][CORE] Follow up: set SO_REUSEADDR on the server socket.

"childOption" is for the remote connections, not for the server socket
that actually listens for incoming connections.

Author: Marcelo Vanzin <va...@cloudera.com>

Closes #21132 from vanzin/SPARK-24029.2.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/428b9038
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/428b9038
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/428b9038

Branch: refs/heads/master
Commit: 428b903859c3d8873045fdcfffdebe24fc6e027f
Parents: c8f3ac6
Author: Marcelo Vanzin <va...@cloudera.com>
Authored: Tue Apr 24 09:10:29 2018 +0800
Committer: hyukjinkwon <gu...@apache.org>
Committed: Tue Apr 24 09:10:29 2018 +0800

----------------------------------------------------------------------
 .../java/org/apache/spark/network/server/TransportServer.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/428b9038/common/network-common/src/main/java/org/apache/spark/network/server/TransportServer.java
----------------------------------------------------------------------
diff --git a/common/network-common/src/main/java/org/apache/spark/network/server/TransportServer.java b/common/network-common/src/main/java/org/apache/spark/network/server/TransportServer.java
index 6127509..60f5112 100644
--- a/common/network-common/src/main/java/org/apache/spark/network/server/TransportServer.java
+++ b/common/network-common/src/main/java/org/apache/spark/network/server/TransportServer.java
@@ -99,8 +99,8 @@ public class TransportServer implements Closeable {
       .group(bossGroup, workerGroup)
       .channel(NettyUtils.getServerChannelClass(ioMode))
       .option(ChannelOption.ALLOCATOR, allocator)
-      .childOption(ChannelOption.ALLOCATOR, allocator)
-      .childOption(ChannelOption.SO_REUSEADDR, !SystemUtils.IS_OS_WINDOWS);
+      .option(ChannelOption.SO_REUSEADDR, !SystemUtils.IS_OS_WINDOWS)
+      .childOption(ChannelOption.ALLOCATOR, allocator);
 
     this.metrics = new NettyMemoryMetrics(
       allocator, conf.getModuleName() + "-server", conf);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org