From 5ca3c0e1363ec50605a83576cea6f8fab7fd0cd5 Mon Sep 17 00:00:00 2001 From: Aaron Stannard Date: Tue, 12 Jan 2016 12:16:54 -0800 Subject: [PATCH] fixes issue with Helios message order at the cost of some throughput --- src/core/Akka.Remote.Tests/RemoteConfigSpec.cs | 12 ++++++------ src/core/Akka.Remote/Configuration/Remote.conf | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/core/Akka.Remote.Tests/RemoteConfigSpec.cs b/src/core/Akka.Remote.Tests/RemoteConfigSpec.cs index d574369696b..a4f09f09033 100644 --- a/src/core/Akka.Remote.Tests/RemoteConfigSpec.cs +++ b/src/core/Akka.Remote.Tests/RemoteConfigSpec.cs @@ -94,8 +94,8 @@ public void Remoting_should_contain_correct_heliosTCP_values_in_ReferenceConf() Assert.True(s.TcpKeepAlive); Assert.True(s.TcpReuseAddr); Assert.True(string.IsNullOrEmpty(c.GetString("hostname"))); - Assert.Equal(2, s.ServerSocketWorkerPoolSize); - Assert.Equal(2, s.ClientSocketWorkerPoolSize); + Assert.Equal(1, s.ServerSocketWorkerPoolSize); + Assert.Equal(1, s.ClientSocketWorkerPoolSize); } [Fact] @@ -106,17 +106,17 @@ public void Remoting_should_contain_correct_socket_worker_pool_configuration_val // server-socket-worker-pool { var pool = c.GetConfig("server-socket-worker-pool"); - Assert.Equal(2, pool.GetInt("pool-size-min")); + Assert.Equal(1, pool.GetInt("pool-size-min")); Assert.Equal(1.0d, pool.GetDouble("pool-size-factor")); - Assert.Equal(2, pool.GetInt("pool-size-max")); + Assert.Equal(1, pool.GetInt("pool-size-max")); } //client-socket-worker-pool { var pool = c.GetConfig("client-socket-worker-pool"); - Assert.Equal(2, pool.GetInt("pool-size-min")); + Assert.Equal(1, pool.GetInt("pool-size-min")); Assert.Equal(1.0d, pool.GetDouble("pool-size-factor")); - Assert.Equal(2, pool.GetInt("pool-size-max")); + Assert.Equal(1, pool.GetInt("pool-size-max")); } } diff --git a/src/core/Akka.Remote/Configuration/Remote.conf b/src/core/Akka.Remote/Configuration/Remote.conf index 4cfb341d5a5..3935b76fcb0 100644 --- a/src/core/Akka.Remote/Configuration/Remote.conf +++ b/src/core/Akka.Remote/Configuration/Remote.conf @@ -400,7 +400,7 @@ akka { # Used to configure the number of I/O worker threads on server sockets server-socket-worker-pool { # Min number of threads to cap factor-based number to - pool-size-min = 2 + pool-size-min = 1 # The pool size factor is used to determine thread pool size # using the following formula: ceil(available processors * factor). @@ -409,13 +409,13 @@ akka { pool-size-factor = 1.0 # Max number of threads to cap factor-based number to - pool-size-max = 2 + pool-size-max = 1 } # Used to configure the number of I/O worker threads on client sockets client-socket-worker-pool { # Min number of threads to cap factor-based number to - pool-size-min = 2 + pool-size-min = 1 # The pool size factor is used to determine thread pool size # using the following formula: ceil(available processors * factor). @@ -424,7 +424,7 @@ akka { pool-size-factor = 1.0 # Max number of threads to cap factor-based number to - pool-size-max = 2 + pool-size-max = 1 }