saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

process_count_max: disable by default

Browse source
This commit is contained in:
Silvio Moioli 2017-09-22 15:37:43 +02:00
parent d53550de35
commit fd4194ade0
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conf/minion
View file

@ -692,8 +692,8 @@
# Limit the maximum amount of processes or threads created by salt-minion.
# This is useful to avoid resource exhaustion in case the minion receives more
# publications than it is able to handle, as it limits the number of spawned
# processes or threads. -1 disables the limit.
#process_count_max: 20
# processes or threads. -1 is the default and disables the limit.
#process_count_max: -1
##### Logging settings #####

6
doc/ref/configuration/minion.rst
View file

@ -2426,16 +2426,16 @@ executed in a thread.
.. versionadded:: Oxygen
Default: ``20``
Default: ``-1``
Limit the maximum amount of processes or threads created by ``salt-minion``.
This is useful to avoid resource exhaustion in case the minion receives more
publications than it is able to handle, as it limits the number of spawned
processes or threads. ``-1`` disables the limit.
processes or threads. ``-1`` is the default and disables the limit.
.. code-block:: yaml
process_count_max: 20
process_count_max: -1
.. _minion-logging-settings:

2
salt/config/__init__.py
View file

@ -1261,7 +1261,7 @@ DEFAULT_MINION_OPTS = {
'auto_accept': True,
'autosign_timeout': 120,
'multiprocessing': True,
'process_count_max': 20,
'process_count_max': -1,
'mine_enabled': True,
'mine_return_job': False,
'mine_interval': 60,