aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-02-15 18:53:45 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-02-15 18:54:19 +0100
commitaf2ce89bda74abb1d18bea11c8fe1ee6e2cb40af (patch)
treefced0d7d2054b08204046d7dffddf3ef455c8be8
parent4d36c77996e54ddda8c7c5e0677bb198e45c0f09 (diff)
fuel-library: Remove tcp_retries2 patch (upstream)
Change-Id: I0f5553f5caeff4c65cfdad76c117c084057ba773 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/fuel-library/upstream-backports/0001-Increase-tcp_retries2-value.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/patches/fuel-library/upstream-backports/0001-Increase-tcp_retries2-value.patch b/patches/fuel-library/upstream-backports/0001-Increase-tcp_retries2-value.patch
deleted file mode 100644
index 02d0a03..0000000
--- a/patches/fuel-library/upstream-backports/0001-Increase-tcp_retries2-value.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Alexey Lebedeff <alebedev@mirantis.com>
-Date: Fri, 3 Feb 2017 19:13:14 +0300
-Subject: [PATCH] Increase tcp_retries2 value
-
-Current value of 5 results in socket operation timeout after ~12.9
-seconds. This is a bit too low, e.g. we've seen RabbitMQ network
-splits in production.
-
-This 12.9s amount is equal as 0.2*(2^1+2^2+..2^5), where 0.2 is a
-retry timeout (RTO) that is calculated by kernel on a per-socket
-basis. But in fast local networks it usually almost equal to minimum
-values of 0.2s hardcoded in linux kernel (and BTW, RFC says that
-minimum value should be 1s).
-
-On the other hand, comment in netconfig.pp says that our target
-timeout is ~54 seconds. And changing tcp_retries2 to 7 is consistent
-with that comment - tests an live env show that resulting timeout is
-~52.2s
-
-Change-Id: Ib52f40ef1017a9da5a29cd62fb744a4597860763
----
- deployment/puppet/osnailyfacter/manifests/netconfig/netconfig.pp | 2 +-
- tests/noop/spec/hosts/netconfig/netconfig_spec.rb | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/deployment/puppet/osnailyfacter/manifests/netconfig/netconfig.pp b/deployment/puppet/osnailyfacter/manifests/netconfig/netconfig.pp
-index 78d5975..42579ac 100644
---- a/deployment/puppet/osnailyfacter/manifests/netconfig/netconfig.pp
-+++ b/deployment/puppet/osnailyfacter/manifests/netconfig/netconfig.pp
-@@ -42,7 +42,7 @@ class osnailyfacter::netconfig::netconfig {
- tcpka_time => '30',
- tcpka_probes => '8',
- tcpka_intvl => '3',
-- tcp_retries2 => '5',
-+ tcp_retries2 => '7',
- }
-
- # increase network backlog for performance on fast networks
-diff --git a/tests/noop/spec/hosts/netconfig/netconfig_spec.rb b/tests/noop/spec/hosts/netconfig/netconfig_spec.rb
-index c175aed..80ea0f2 100644
---- a/tests/noop/spec/hosts/netconfig/netconfig_spec.rb
-+++ b/tests/noop/spec/hosts/netconfig/netconfig_spec.rb
-@@ -27,7 +27,7 @@ describe manifest do
- 'tcpka_time' => '30',
- 'tcpka_probes' => '8',
- 'tcpka_intvl' => '3',
-- 'tcp_retries2' => '5',
-+ 'tcp_retries2' => '7',
- ) }
- it { should contain_sysctl__value('net.core.netdev_max_backlog').with('value' => '261144') }
- it { should contain_class('sysfs') }