diff --git a/akka-remote/src/main/scala/akka/cluster/RemoteConfig.scala b/akka-remote/src/main/scala/akka/cluster/RemoteConfig.scala index 34a77539b7..acabf4604a 100644 --- a/akka-remote/src/main/scala/akka/cluster/RemoteConfig.scala +++ b/akka-remote/src/main/scala/akka/cluster/RemoteConfig.scala @@ -35,13 +35,6 @@ object RemoteServerSettings { val UNTRUSTED_MODE = config.getBool("akka.cluster.server.untrusted-mode", false) val PORT = config.getInt("akka.cluster.server.port", 2552) val CONNECTION_TIMEOUT = Duration(config.getInt("akka.cluster.server.connection-timeout", 100), TIME_UNIT) - val COMPRESSION_SCHEME = config.getString("akka.cluster.compression-scheme", "") - val ZLIB_COMPRESSION_LEVEL = { - val level = config.getInt("akka.cluster.zlib-compression-level", 6) - if (level < 1 && level > 9) throw new IllegalArgumentException( - "zlib compression level has to be within 1-9, with 1 being fastest and 9 being the most compressed") - level - } val BACKLOG = config.getInt("akka.cluster.server.backlog", 4096) diff --git a/akka-remote/src/main/scala/akka/cluster/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/cluster/netty/NettyRemoteSupport.scala index 7710b6d41f..8d9e0967ec 100644 --- a/akka-remote/src/main/scala/akka/cluster/netty/NettyRemoteSupport.scala +++ b/akka-remote/src/main/scala/akka/cluster/netty/NettyRemoteSupport.scala @@ -476,14 +476,9 @@ class ActiveRemoteClientPipelineFactory( val lenPrep = new LengthFieldPrepender(4) val protobufDec = new ProtobufDecoder(AkkaRemoteProtocol.getDefaultInstance) val protobufEnc = new ProtobufEncoder - val (enc, dec) = RemoteServerSettings.COMPRESSION_SCHEME match { - case "zlib" ⇒ (new ZlibEncoder(RemoteServerSettings.ZLIB_COMPRESSION_LEVEL) :: Nil, new ZlibDecoder :: Nil) - case _ ⇒ (Nil, Nil) - } - val remoteClient = new ActiveRemoteClientHandler(name, futures, bootstrap, remoteAddress, timer, client) - val stages: List[ChannelHandler] = timeout :: dec ::: lenDec :: protobufDec :: enc ::: lenPrep :: protobufEnc :: remoteClient :: Nil - new StaticChannelPipeline(stages: _*) + + new StaticChannelPipeline(timeout, lenDec, protobufDec, lenPrep, protobufEnc, remoteClient) } } @@ -840,13 +835,10 @@ class RemoteServerPipelineFactory( val lenPrep = new LengthFieldPrepender(4) val protobufDec = new ProtobufDecoder(AkkaRemoteProtocol.getDefaultInstance) val protobufEnc = new ProtobufEncoder - val (enc, dec) = COMPRESSION_SCHEME match { - case "zlib" ⇒ (new ZlibEncoder(ZLIB_COMPRESSION_LEVEL) :: Nil, new ZlibDecoder :: Nil) - case _ ⇒ (Nil, Nil) - } + val authenticator = if (REQUIRE_COOKIE) new RemoteServerAuthenticationHandler(SECURE_COOKIE) :: Nil else Nil val remoteServer = new RemoteServerHandler(name, openChannels, loader, server) - val stages: List[ChannelHandler] = dec ::: lenDec :: protobufDec :: enc ::: lenPrep :: protobufEnc :: executor :: authenticator ::: remoteServer :: Nil + val stages: List[ChannelHandler] = lenDec :: protobufDec :: lenPrep :: protobufEnc :: executor :: authenticator ::: remoteServer :: Nil new StaticChannelPipeline(stages: _*) } } diff --git a/akka-spring/src/test/resources/akka-test.conf b/akka-spring/src/test/resources/akka-test.conf index f8992c3fa8..0bf7e613be 100644 --- a/akka-spring/src/test/resources/akka-test.conf +++ b/akka-spring/src/test/resources/akka-test.conf @@ -128,9 +128,6 @@ akka { # secure-cookie = "050E0A0D0D06010A00000900040D060F0C09060B" # generate your own with '$AKKA_HOME/scripts/generate_secure_cookie.sh' or using 'Crypt.generateSecureCookie' secure-cookie = "" - compression-scheme = "zlib" # Options: "zlib" (lzf to come), leave out for no compression - zlib-compression-level = 6 # Options: 0-9 (1 being fastest and 9 being the most compressed), default is 6 - layer = "akka.cluster.netty.NettyRemoteSupport" server { diff --git a/config/akka-reference.conf b/config/akka-reference.conf index e29f2dacd8..bd49c3048c 100644 --- a/config/akka-reference.conf +++ b/config/akka-reference.conf @@ -197,8 +197,6 @@ akka { remote-daemon-ack-timeout = 30 # Timeout for ACK of cluster operations, lik checking actor out etc. include-ref-node-in-replica-set = on # Can a replica be instantiated on the same node as the cluster reference to the actor # Default: on - compression-scheme = "" # Options: "zlib" (lzf to come), leave out for no compression - zlib-compression-level = 6 # Options: 0-9 (1 being fastest and 9 being the most compressed), default is 6 # FIXME rename to transport layer = "akka.cluster.netty.NettyRemoteSupport"