From b5fed75ed5ac059443b7669c1168d0cbce7a5a517d92cc0c4dbfb28f746c767c Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Fri, 28 Nov 2014 08:06:54 +0000 Subject: [PATCH 1/2] Accepting request 263284 from home:rmilasan:branches:Base:System - Increase number of children/workers to CPU_COUNT * 256 to avoid 'maximum number of children reached' (bnc#907393). Add 1097-udevd-increase-maximum-number-of-children.patch - Increase number of children/workers to CPU_COUNT * 256 to avoid 'maximum number of children reached' (bnc#907393). Add 1097-udevd-increase-maximum-number-of-children.patch OBS-URL: https://build.opensuse.org/request/show/263284 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=826 --- ...-increase-maximum-number-of-children.patch | 22 +++++++++++++++++++ systemd-mini.changes | 7 ++++++ systemd-mini.spec | 3 +++ systemd.changes | 7 ++++++ systemd.spec | 3 +++ 5 files changed, 42 insertions(+) create mode 100644 1097-udevd-increase-maximum-number-of-children.patch diff --git a/1097-udevd-increase-maximum-number-of-children.patch b/1097-udevd-increase-maximum-number-of-children.patch new file mode 100644 index 00000000..9b23bc18 --- /dev/null +++ b/1097-udevd-increase-maximum-number-of-children.patch @@ -0,0 +1,22 @@ +Index: systemd-210/src/udev/udevd.c +=================================================================== +--- systemd-210.orig/src/udev/udevd.c ++++ systemd-210/src/udev/udevd.c +@@ -454,7 +454,7 @@ static void event_run(struct event *even + + if (children >= children_max) { + if (children_max > 1) +- log_debug("maximum number (%i) of children reached", children); ++ log_error("maximum number (%i) of children reached", children); + return; + } + +@@ -1277,7 +1277,7 @@ int main(int argc, char *argv[]) { + children_max = 8; + + if (sched_getaffinity(0, sizeof (cpu_set), &cpu_set) == 0) { +- children_max += CPU_COUNT(&cpu_set) * 2; ++ children_max += CPU_COUNT(&cpu_set) * 256; + } + } + log_debug("set children_max to %u", children_max); diff --git a/systemd-mini.changes b/systemd-mini.changes index f50611e0..80c94b2a 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 27 20:30:35 UTC 2014 - rmilasan@suse.com + +- Increase number of children/workers to CPU_COUNT * 256 to avoid + 'maximum number of children reached' (bnc#907393). + Add 1097-udevd-increase-maximum-number-of-children.patch + ------------------------------------------------------------------- Tue Nov 25 09:44:42 UTC 2014 - rmilasan@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 43deb2f4..77920367 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1243,6 +1243,8 @@ Patch1094: 1094-udev-avoid-magic-constants-in-kernel-cmdline-parsers.patch Patch1095: 1095-set-ssd-disk-to-use-deadline-scheduler.patch # PATCH-FIX-SUSE 1096-new-udev-root-symlink-generator.patch Patch1096: 1096-new-udev-root-symlink-generator.patch +# PATCH-FIX-SUSE 1097-udevd-increase-maximum-number-of-children.patch +Patch1097: 1097-udevd-increase-maximum-number-of-children.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -2043,6 +2045,7 @@ cp %{SOURCE7} m4/ %patch1094 -p0 %patch1095 -p1 %patch1096 -p1 +%patch1097 -p1 # remove patch backups find -name '*.orig' -exec rm -f '{}' \+ diff --git a/systemd.changes b/systemd.changes index f50611e0..80c94b2a 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 27 20:30:35 UTC 2014 - rmilasan@suse.com + +- Increase number of children/workers to CPU_COUNT * 256 to avoid + 'maximum number of children reached' (bnc#907393). + Add 1097-udevd-increase-maximum-number-of-children.patch + ------------------------------------------------------------------- Tue Nov 25 09:44:42 UTC 2014 - rmilasan@suse.com diff --git a/systemd.spec b/systemd.spec index a8ae7b75..16bb7ba7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1238,6 +1238,8 @@ Patch1094: 1094-udev-avoid-magic-constants-in-kernel-cmdline-parsers.patch Patch1095: 1095-set-ssd-disk-to-use-deadline-scheduler.patch # PATCH-FIX-SUSE 1096-new-udev-root-symlink-generator.patch Patch1096: 1096-new-udev-root-symlink-generator.patch +# PATCH-FIX-SUSE 1097-udevd-increase-maximum-number-of-children.patch +Patch1097: 1097-udevd-increase-maximum-number-of-children.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -2038,6 +2040,7 @@ cp %{SOURCE7} m4/ %patch1094 -p0 %patch1095 -p1 %patch1096 -p1 +%patch1097 -p1 # remove patch backups find -name '*.orig' -exec rm -f '{}' \+ From dfb277d2c3a246010c5eb8a9be55773baf396a226e763feae5a7c6c4b2e04805 Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Fri, 28 Nov 2014 13:28:32 +0000 Subject: [PATCH 2/2] Accepting request 263343 from home:rmilasan:branches:Base:System - Change the maximum number of children from CPU_COUNT * 256 to CPU_COUNT * 64. Update 1097-udevd-increase-maximum-number-of-children.patch - Change the maximum number of children from CPU_COUNT * 256 to CPU_COUNT * 64. Update 1097-udevd-increase-maximum-number-of-children.patch OBS-URL: https://build.opensuse.org/request/show/263343 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=827 --- 1097-udevd-increase-maximum-number-of-children.patch | 2 +- systemd-mini.changes | 7 +++++++ systemd.changes | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/1097-udevd-increase-maximum-number-of-children.patch b/1097-udevd-increase-maximum-number-of-children.patch index 9b23bc18..50bbc56f 100644 --- a/1097-udevd-increase-maximum-number-of-children.patch +++ b/1097-udevd-increase-maximum-number-of-children.patch @@ -16,7 +16,7 @@ Index: systemd-210/src/udev/udevd.c if (sched_getaffinity(0, sizeof (cpu_set), &cpu_set) == 0) { - children_max += CPU_COUNT(&cpu_set) * 2; -+ children_max += CPU_COUNT(&cpu_set) * 256; ++ children_max += CPU_COUNT(&cpu_set) * 64; } } log_debug("set children_max to %u", children_max); diff --git a/systemd-mini.changes b/systemd-mini.changes index 80c94b2a..872f66b3 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Nov 28 13:26:21 UTC 2014 - rmilasan@suse.com + +- Change the maximum number of children from CPU_COUNT * 256 to + CPU_COUNT * 64. + Update 1097-udevd-increase-maximum-number-of-children.patch + ------------------------------------------------------------------- Thu Nov 27 20:30:35 UTC 2014 - rmilasan@suse.com diff --git a/systemd.changes b/systemd.changes index 80c94b2a..872f66b3 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Nov 28 13:26:21 UTC 2014 - rmilasan@suse.com + +- Change the maximum number of children from CPU_COUNT * 256 to + CPU_COUNT * 64. + Update 1097-udevd-increase-maximum-number-of-children.patch + ------------------------------------------------------------------- Thu Nov 27 20:30:35 UTC 2014 - rmilasan@suse.com