Changing who is affected by the sysctl tunning

Only the swift-nodes need to be tuned according to
https://bugs.launchpad.net/swift/+bug/1075606. And enlarge the local
port range on the controller can overlap with the listening services.

Changing the local range port

We must don't overlap the local range port and the listening ports.
Listening port on swift nodes are around 6800. With a bad ordering or a
restart we can face a already used port problem.

Co-Authored-By: Emilien Macchi <emilien@redhat.com>
Change-Id: I5e875403946a22ec8c5848af259d3afa84db4e35
(cherry picked from commit 9267538fc8)
This commit is contained in:
Cedric Lecomte
2015-04-14 09:29:14 -04:00
committed by Cédric LECOMTE
parent 353d1bf857
commit 91f77b7df0
4 changed files with 7 additions and 3 deletions

View File

@@ -30,6 +30,4 @@ class cloud::object(
swift_hash_suffix => $swift_hash_suffix,
}
class {'cloud::object::tweaking': }
}

View File

@@ -75,6 +75,8 @@ class cloud::object::storage(
include 'cloud::object'
include 'cloud::object::tweaking'
class { 'swift::storage':
storage_local_net_ip => $storage_eth,
}

View File

@@ -22,7 +22,7 @@ class cloud::object::tweaking {
'net.ipv4.tcp_tw_recycle' => { value => 1 },
'net.ipv4.tcp_tw_reuse' => { value => 1 },
'net.ipv4.tcp_syncookies' => { value => 0 },
'net.ipv4.ip_local_port_range' => { value => "1024\t65000" },
'net.ipv4.ip_local_port_range' => { value => "10000\t65000" },
'net.core.netdev_max_backlog' => { value => 300000 },
'net.ipv4.tcp_sack' => { value => 0 },
}

View File

@@ -39,6 +39,10 @@ describe 'cloud::object::storage' do
'storage_local_net_ip' => '127.0.0.1',
})
is_expected.to contain_sysctl('net.ipv4.ip_local_port_range').with(
:val => "10000\t65000",
)
is_expected.to contain_swift__storage__server('6000').with({
'type' => 'object',
'config_file_path' => 'object-server.conf',