diff --git a/akka-remote/src/main/resources/reference.conf b/akka-remote/src/main/resources/reference.conf index 1091c2814c..7350d3d96f 100644 --- a/akka-remote/src/main/resources/reference.conf +++ b/akka-remote/src/main/resources/reference.conf @@ -78,12 +78,6 @@ akka { # Reuse inbound connections for outbound messages use-passive-connections = on - # Dispatcher that the actors responsible to write to a connection will use. - # The mailbox type must be always a DequeBasedMailbox. - writer-dispatcher { - mailbox-type = "akka.dispatch.UnboundedDequeBasedMailbox" - } - # Controls the backoff interval after a refused write is reattempted. # (Transports may refuse writes if their internal buffer is full) backoff-interval = 0.01 s diff --git a/akka-remote/src/main/scala/akka/remote/Endpoint.scala b/akka-remote/src/main/scala/akka/remote/Endpoint.scala index 8b366352e1..f3f922cd92 100644 --- a/akka-remote/src/main/scala/akka/remote/Endpoint.scala +++ b/akka-remote/src/main/scala/akka/remote/Endpoint.scala @@ -321,9 +321,7 @@ private[remote] class ReliableDeliverySupervisor( settings = settings, AkkaPduProtobufCodec, receiveBuffers = receiveBuffers, - reliableDeliverySupervisor = Some(self)) - .withDispatcher("akka.remote.writer-dispatcher").withDeploy(Deploy.local), - "endpointWriter")) + reliableDeliverySupervisor = Some(self)).withDeploy(Deploy.local), "endpointWriter")) } } diff --git a/akka-remote/src/main/scala/akka/remote/Remoting.scala b/akka-remote/src/main/scala/akka/remote/Remoting.scala index c173e309c8..aa74a186af 100644 --- a/akka-remote/src/main/scala/akka/remote/Remoting.scala +++ b/akka-remote/src/main/scala/akka/remote/Remoting.scala @@ -655,7 +655,7 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends transport, endpointSettings, AkkaPduProtobufCodec, - receiveBuffers).withDispatcher("akka.remote.writer-dispatcher").withDeploy(Deploy.local), + receiveBuffers).withDeploy(Deploy.local), "reliableEndpointWriter-" + AddressUrlEncoder(remoteAddress) + "-" + endpointId.next())) else context.watch(context.actorOf(EndpointWriter.props( handleOption, @@ -665,7 +665,7 @@ private[remote] class EndpointManager(conf: Config, log: LoggingAdapter) extends endpointSettings, AkkaPduProtobufCodec, receiveBuffers, - reliableDeliverySupervisor = None).withDispatcher("akka.remote.writer-dispatcher").withDeploy(Deploy.local), + reliableDeliverySupervisor = None).withDeploy(Deploy.local), "endpointWriter-" + AddressUrlEncoder(remoteAddress) + "-" + endpointId.next())) } diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala index afc49a7904..fcaf62247e 100644 --- a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala @@ -90,14 +90,6 @@ object RemotingSpec { "akka.remote.netty.ssl" ] - writer-dispatcher { - executor = "fork-join-executor" - fork-join-executor { - parallelism-min = 2 - parallelism-max = 2 - } - } - netty.tcp = $${common-netty-settings} netty.udp = $${common-netty-settings} netty.ssl = $${common-netty-settings}