From 4ec48c87803916e90a8f30afae6c8bdee5bb9ba5 Mon Sep 17 00:00:00 2001 From: rpm-build Date: Wed, 1 Aug 2018 13:19:39 +0200 Subject: [PATCH] pid1: bump DefaultTasksMax to 80% of the kernel pid.max value This should be hopefully high enough even for the very big deployments. RHEL-only Resolves: #2003031 diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 3805a010e2..b8e2b65625 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -404,10 +404,10 @@ Configure the default value for the per-unit TasksMax= setting. See systemd.resource-control5 for details. This setting applies to all unit types that support resource control settings, with the exception - of slice units. Defaults to 15% of the minimum of kernel.pid_max=, kernel.threads-max= + of slice units. Defaults to 80% of the minimum of kernel.pid_max=, kernel.threads-max= and root cgroup pids.max. Kernel has a default value for kernel.pid_max= and an algorithm of counting in case of more than 32 cores. - For example with the default kernel.pid_max=, DefaultTasksMax= defaults to 4915, + For example with the default kernel.pid_max=, DefaultTasksMax= defaults to 26214, but might be greater in other systems or smaller in OS containers. diff --git a/src/core/main.c b/src/core/main.c index 57aedb9b93..7ea848ebeb 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -98,7 +98,7 @@ #include #endif -#define DEFAULT_TASKS_MAX ((TasksMax) { 15U, 100U }) /* 15% */ +#define DEFAULT_TASKS_MAX ((TasksMax) { 80U, 100U }) /* 80% */ static enum { ACTION_RUN, diff --git a/src/core/system.conf.in b/src/core/system.conf.in index 96fb64d2c1..c0dc6a7e17 100644 --- a/src/core/system.conf.in +++ b/src/core/system.conf.in @@ -54,7 +54,7 @@ #DefaultBlockIOAccounting=no #DefaultMemoryAccounting={{ 'yes' if MEMORY_ACCOUNTING_DEFAULT else 'no' }} #DefaultTasksAccounting=yes -#DefaultTasksMax=15% +#DefaultTasksMax=80% #DefaultLimitCPU= #DefaultLimitFSIZE= #DefaultLimitDATA=