Change storage worker default to ::os_workers

This patch changes the default worker count from 1 to the ::os_workers fact.
::os_workers is based on the number of processors (currently cpu/4) but is
capped at a maximum of 8 worker processors.  This is a much more reasonable
default in general and prevents excessive resource consumption on systems with
a large number of CPUs.

This is a follow up to Ifa4f425091fae81204df68dd536f364efd647e3d

Related-Bug: 1655070
Change-Id: I29fd3d8930f32650549bfbf96478232075a7d0b9
This commit is contained in:
Christian Schwede
2017-01-11 10:28:50 +01:00
parent afa2874daf
commit 121615cc1f

View File

@@ -58,7 +58,7 @@
# one. Increasing the number of workers may reduce the possibility of slow file # one. Increasing the number of workers may reduce the possibility of slow file
# system operations in one request from negatively impacting other requests. # system operations in one request from negatively impacting other requests.
# See http://docs.openstack.org/developer/swift/deployment_guide.html#general-service-tuning # See http://docs.openstack.org/developer/swift/deployment_guide.html#general-service-tuning
# Defaults to '1'. # Defaults to $::os_workers.
# #
# [*allow_versions*] # [*allow_versions*]
# (optional) Enable/Disable object versioning feature # (optional) Enable/Disable object versioning feature
@@ -147,7 +147,7 @@ define swift::storage::server(
$pipeline = ["${type}-server"], $pipeline = ["${type}-server"],
$mount_check = true, $mount_check = true,
$user = 'swift', $user = 'swift',
$workers = '1', $workers = $::os_workers,
$allow_versions = false, $allow_versions = false,
$replicator_concurrency = 1, $replicator_concurrency = 1,
$updater_concurrency = 1, $updater_concurrency = 1,