Skip to content

Commit f8d6c08

Browse files
committed
Set concurrency to 1 for auditor/replicator/updater
Before this the default concurrency was set to $::processorcount, and this resulted in environments where 24 auditors/replicators/reapers processes were all using the same disk. This results in a high I/O load, because every thread blocks the others. These values are 1 by default in Swift. If one has many disks and a powerful machine, a single-digit concurrency for auditors and replicators might work fine; the reaper is most likely only running with a concurrency of 1 in any case. Let's set this to the default of 1; operators with a need to use a higher value can easily override the defaults (and probably want to use a value that is appropriate to their setup). Closes-Bug: 1631359 Change-Id: I54a5d01e4bd357973e142274db79d119e9e46457
1 parent bb40ae3 commit f8d6c08

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

manifests/storage/server.pp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@
6666
#
6767
# [*replicator_concurrency*]
6868
# (optional) Number of replicator workers to spawn.
69-
# Defaults to $::processorcount.
69+
# Defaults to 1.
7070
#
7171
# [*updater_concurrency*]
7272
# (optional) Number of updater workers to spawn.
73-
# Defaults to $::processorcount.
73+
# Defaults to 1.
7474
#
7575
# [*reaper_concurrency*]
7676
# (optional) Number of reaper workers to spawn.
77-
# Defaults to $::processorcount.
77+
# Defaults to 1.
7878
#
7979
# [*log_facility*]
8080
# (optional) Syslog log facility.
@@ -149,9 +149,9 @@
149149
$user = 'swift',
150150
$workers = '1',
151151
$allow_versions = false,
152-
$replicator_concurrency = $::processorcount,
153-
$updater_concurrency = $::processorcount,
154-
$reaper_concurrency = $::processorcount,
152+
$replicator_concurrency = 1,
153+
$updater_concurrency = 1,
154+
$reaper_concurrency = 1,
155155
$log_facility = 'LOG_LOCAL2',
156156
$log_level = 'INFO',
157157
$log_address = '/dev/log',

spec/defines/swift_storage_node_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
OSDefaults.get_facts({
55
:operatingsystem => 'Ubuntu',
66
:osfamily => 'Debian',
7-
:processorcount => 1,
87
})
98
end
109

spec/defines/swift_storage_server_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
OSDefaults.get_facts({
66
:operatingsystem => 'Ubuntu',
77
:osfamily => 'Debian',
8-
:processorcount => 1,
98
})
109
end
1110

0 commit comments

Comments
 (0)