From 6dbe352ffca95111a69dd04c21b2ce237bce184720f638811fb79db05fe3479c Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Tue, 15 Mar 2022 12:23:52 +0000 Subject: [PATCH] Accepting request 961869 from home:trenn:branches:Base:System - Add new openshift platform profiles - Instead of adding all profiles to main package and exclude subpackage profiles, explicitly mention all added profiles in %files section - Sort (alphabetically) profiles and packages - Update to version 2.18.0.8+git.6f907c9: * beakerlib: fix systemd rate limiting for variables-support-in-profiles * scheduler: fix construction of the process name regex * Added more conflicting implementations to the systemd unit file. * raise the netfilter hash table size in openshift/atomic-{host,guest} to match the max netfilter conntrack entries, reducing such hash table load. * Fixing save call and comments in tuned gui * Adding option "txqueuelen" to net_plugin * bootloader: on s390(x) remove TuneD variables from the BLS * daemon: don't do full rollback on systemd failure * profiles: use cstate.id_no_zero instead of the cstate.id * Expanding cpu plugin force_latency option syntax * Adding support for nvme subsystem block devices and adding tests so it won't throw errors on hdparms commands. * Fix improper parsing of include directive * application: log TuneD and kernel version * readme: mention conflicting cpupower and power-profiles-daemon * dbus: fix traceback on python-2.7 * cpu_partitioning: fixed no_balance_cores on newer kernels * spec: do not require subscription-manager on CentOS * Add conditional profile loading * openshift profile: workaround high CPU utilization of [scheduler] plug-in. * scheduler: new option cgroup_ps_blacklist * breaking up various modules and implementing neccessary new syntax used downstream to keep docs repos synced OBS-URL: https://build.opensuse.org/request/show/961869 OBS-URL: https://build.opensuse.org/package/show/Base:System/tuned?expand=0&rev=81 --- _service | 8 +- _servicedata | 2 +- tuned-2.16.0.obscpio | 3 - tuned-2.18.0.8+git.6f907c9.obscpio | 3 + tuned.changes | 30 +++++ tuned.obsinfo | 6 +- tuned.rpmlintrc | 7 +- tuned.spec | 195 ++++++++++++++++------------- 8 files changed, 153 insertions(+), 101 deletions(-) delete mode 100644 tuned-2.16.0.obscpio create mode 100644 tuned-2.18.0.8+git.6f907c9.obscpio diff --git a/_service b/_service index 75c1870..30c5477 100644 --- a/_service +++ b/_service @@ -4,13 +4,11 @@ https://github.com/redhat-performance/tuned + 2.15.0+git.%h @PARENT_TAG@ +--> + @PARENT_TAG@.@TAG_OFFSET@+git.%h v(.*) - - v2.16.0 enable diff --git a/_servicedata b/_servicedata index 0c96eaa..d46ea75 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/redhat-performance/tuned - e4733cdb6359f0c3641df312543974eecbbfa2c3 \ No newline at end of file + 6f907c943ac2d8f7ed4f5867cf48a7532864e160 \ No newline at end of file diff --git a/tuned-2.16.0.obscpio b/tuned-2.16.0.obscpio deleted file mode 100644 index f4b0bb7..0000000 --- a/tuned-2.16.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14521ec8730251b5501b8bcb9505a922b6f211dc3bc8b0ce390c2ee0f8666e2c -size 932364 diff --git a/tuned-2.18.0.8+git.6f907c9.obscpio b/tuned-2.18.0.8+git.6f907c9.obscpio new file mode 100644 index 0000000..2ae7389 --- /dev/null +++ b/tuned-2.18.0.8+git.6f907c9.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fb618c03c94eea85b1985ec4064513b39becf24fe0cc5161bf0b1b3814ce0d9 +size 966156 diff --git a/tuned.changes b/tuned.changes index 0e455ab..78ca2d6 100644 --- a/tuned.changes +++ b/tuned.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Tue Mar 15 12:09:24 UTC 2022 - trenn@suse.de + +- Add new openshift platform profiles +- Instead of adding all profiles to main package and exclude subpackage + profiles, explicitly mention all added profiles in %files section +- Sort (alphabetically) profiles and packages +- Update to version 2.18.0.8+git.6f907c9: + * beakerlib: fix systemd rate limiting for variables-support-in-profiles + * scheduler: fix construction of the process name regex + * Added more conflicting implementations to the systemd unit file. + * raise the netfilter hash table size in openshift/atomic-{host,guest} to match the max netfilter conntrack entries, reducing such hash table load. + * Fixing save call and comments in tuned gui + * Adding option "txqueuelen" to net_plugin + * bootloader: on s390(x) remove TuneD variables from the BLS + * daemon: don't do full rollback on systemd failure + * profiles: use cstate.id_no_zero instead of the cstate.id + * Expanding cpu plugin force_latency option syntax + * Adding support for nvme subsystem block devices and adding tests so it won't throw errors on hdparms commands. + * Fix improper parsing of include directive + * application: log TuneD and kernel version + * readme: mention conflicting cpupower and power-profiles-daemon + * dbus: fix traceback on python-2.7 + * cpu_partitioning: fixed no_balance_cores on newer kernels + * spec: do not require subscription-manager on CentOS + * Add conditional profile loading + * openshift profile: workaround high CPU utilization of [scheduler] plug-in. + * scheduler: new option cgroup_ps_blacklist + * breaking up various modules and implementing neccessary new syntax used downstream to keep docs repos synced + ------------------------------------------------------------------- Fri Sep 10 19:53:30 UTC 2021 - trenn@suse.de diff --git a/tuned.obsinfo b/tuned.obsinfo index 9109805..e755049 100644 --- a/tuned.obsinfo +++ b/tuned.obsinfo @@ -1,5 +1,5 @@ name: tuned -version: 2.16.0 -mtime: 1626892915 -commit: e4733cdb6359f0c3641df312543974eecbbfa2c3 +version: 2.18.0.8+git.6f907c9 +mtime: 1647345988 +commit: 6f907c943ac2d8f7ed4f5867cf48a7532864e160 diff --git a/tuned.rpmlintrc b/tuned.rpmlintrc index ea5e1c9..79298ed 100644 --- a/tuned.rpmlintrc +++ b/tuned.rpmlintrc @@ -1,5 +1,4 @@ addFilter("W: files-duplicate /etc/tuned/realtime-virtual-host-variables.conf /etc/tuned/realtime-virtual-guest-variables.conf") -addFilter("W: zero-length /etc/tuned/active_profile") -addFilter("W: zero-length /etc/tuned/profile_mode") -addFilter("W: obsolete-not-provided pm-profiler") -addFilter("W: files-duplicate /etc/tuned/realtime-virtual-guest-variables.conf /etc/tuned/realtime-virtual-host-variables.conf") +addFilter("E: zero-length /etc/tuned/active_profile") +addFilter("E: zero-length /etc/tuned/profile_mode") +addFilter("E: zero-length /etc/tuned/post_loaded_profile") diff --git a/tuned.spec b/tuned.spec index 51a377b..82b617f 100644 --- a/tuned.spec +++ b/tuned.spec @@ -1,7 +1,7 @@ # # spec file for package tuned # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define profile_dir %{_prefix}/lib/%{name} Name: tuned -Version: 2.16.0 +Version: 2.18.0.8+git.6f907c9 Release: 0 Summary: A dynamic adaptive system tuning daemon License: GPL-2.0-or-later @@ -59,6 +59,29 @@ Based on that information components will then be put into lower or higher power saving modes to adapt to the current usage. Currently only ethernet network and ATA harddisk devices are implemented. +%package utils +Summary: Disk and net statistic monitoring systemtap scripts +Group: System/Base +Requires: %{name} = %{version} +Requires: powertop + +%description utils +This package contains utilities that can help you to fine tune your +system and manage tuned profiles. + +%package utils-systemtap +Summary: Disk and net statistic monitoring systemtap scripts +Group: System/Base +Requires: %{name} = %{version} +Requires: systemtap + +%description utils-systemtap +This package contains several systemtap scripts to allow detailed +manual monitoring of the system. Instead of the typical IO/sec it collects +minimal, maximal and average time between operations to be able to +identify applications that behave power inefficient (many small operations +instead of fewer large ones). + %package gtk Summary: Disk and net statistic monitoring systemtap scripts - GTK GUI Group: System/Base @@ -68,6 +91,56 @@ Requires: powertop %description gtk GTK GUI that can control tuned and provide simple profile editor. +%package profiles-atomic +Summary: Additional tuned profiles targeted to Atomic +Group: System/Base +Requires: %{name} = %{version} + +%description profiles-atomic +Additional profile(s) for the tuned daemon, targeted to Atomic host and guest. + +%package profiles-nfv +Summary: Additional tuned profiles targeted to Network Function Virtualization (NFV) +Group: System/Base +Requires: %{name} = %{version} + +%description profiles-nfv +Additional profile(s) for the tuned daemon, targeted to Network Function Virtualization (NFV). + +%package profiles-openshift +Summary: Additional tuned profile(s) optimized for the OpenShift platform +Requires: %{name} = %{version} + +%description profiles-openshift +Additional 3 profiles for the Openshift platform: +A parent profile containing tuning shared by OpenShift control plane and worker nodes. +One profile optimized for OpenShift control plane. +And a third profile optimized for general workloads on OpenShift worker nodes. + +%package profiles-oracle +Summary: Additional tuned profiles targeted to Oracle loads +Group: System/Base +Requires: %{name} = %{version} + +%description profiles-oracle +Additional profile(s) for the tuned daemon, targeted to Oracle loads. + +%package profiles-postgresql +Summary: Additional tuned profile(s) targeted to PostgreSQL server loads +Requires: %{name} = %{version} + +%description profiles-postgresql +Additional tuned profile(s) targeted to PostgreSQL server loads. + +%package profiles-realtime +Summary: Additional tuned profiles targeted to realtime +Group: System/Base +Requires: %{name} = %{version} + +%description profiles-realtime +Additional profile(s) for the tuned daemon, targeted to realtime. + + # Do not ship SAP profiles for SLE and Leap, there are other packages # providing these profiles %if !0%{?sle_version} @@ -88,54 +161,6 @@ Requires: %{name} = %{version} Additional profile(s) for the tuned daemon, targeted to SAP HANA loads. %endif -%package profiles-atomic -Summary: Additional tuned profiles targeted to Atomic -Group: System/Base -Requires: %{name} = %{version} - -%description profiles-atomic -Additional profile(s) for the tuned daemon, targeted to Atomic host and guest. - -%package profiles-realtime -Summary: Additional tuned profiles targeted to realtime -Group: System/Base -Requires: %{name} = %{version} - -%description profiles-realtime -Additional profile(s) for the tuned daemon, targeted to realtime. - -%package profiles-oracle -Summary: Additional tuned profiles targeted to Oracle loads -Group: System/Base -Requires: %{name} = %{version} - -%description profiles-oracle -Additional profile(s) for the tuned daemon, targeted to Oracle loads. - -%package profiles-nfv -Summary: Additional tuned profiles targeted to Network Function Virtualization (NFV) -Group: System/Base -Requires: %{name} = %{version} - -%description profiles-nfv -Additional profile(s) for the tuned daemon, targeted to Network Function Virtualization (NFV). - -%package utils -Summary: Disk and net statistic monitoring systemtap scripts -Group: System/Base -Requires: %{name} = %{version} -Requires: powertop - -%description utils -This package contains utilities that can help you to fine tune your -system and manage tuned profiles. - -%package utils-systemtap -Summary: Disk and net statistic monitoring systemtap scripts -Group: System/Base -Requires: %{name} = %{version} -Requires: systemtap - %package profiles-spectrumscale Summary: Additional tuned profile(s) optimized for IBM Spectrum Scale Requires: %{name} = %{version} @@ -143,23 +168,8 @@ Requires: %{name} = %{version} %description profiles-spectrumscale Additional tuned profile(s) optimized for IBM Spectrum Scale. -%description utils-systemtap -This package contains several systemtap scripts to allow detailed -manual monitoring of the system. Instead of the typical IO/sec it collects -minimal, maximal and average time between operations to be able to -identify applications that behave power inefficient (many small operations -instead of fewer large ones). - -%package profiles-postgresql -Summary: Additional tuned profile(s) targeted to PostgreSQL server loads -Requires: %{name} = %{version} - -%description profiles-postgresql -Additional tuned profile(s) targeted to PostgreSQL server loads. - %prep -%setup -q -%autopatch -p1 +%autosetup -p1 %build # The tuned daemon is written in pure Python. Nothing requires to be built. @@ -208,28 +218,38 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' %{_sysconfdir}/tuned/active_profile %doc AUTHORS README %{_datadir}/bash-completion/completions/tuned-adm %{_datadir}/polkit-1/actions/com.redhat.tuned.policy -%exclude %{python3_sitelib}/tuned/gtk %{python3_sitelib}/tuned %{_sbindir}/tuned %{_sbindir}/tuned-adm %{_sbindir}/rctuned -%exclude %{_sysconfdir}/tuned/realtime-variables.conf -%exclude %{_sysconfdir}/tuned/realtime-virtual-guest-variables.conf -%exclude %{_sysconfdir}/tuned/realtime-virtual-host-variables.conf -%exclude %{profile_dir}/realtime-virtual-guest -%exclude %{profile_dir}/realtime-virtual-host -%exclude %{profile_dir}/sap-netweaver -%exclude %{profile_dir}/sap-hana -%exclude %{_mandir}/man7/tuned-profiles-sap*.7.gz -%exclude %{profile_dir}/atomic-host -%exclude %{profile_dir}/atomic-guest -%exclude %{profile_dir}/oracle -%exclude %{profile_dir}/realtime -%exclude %{profile_dir}/defirqaffinity* -%exclude %{_prefix}/lib/tuned/postgresql -%exclude %{_prefix}/lib/tuned/spectrumscale-ece +%dir %{profile_dir} +%dir %{profile_dir}/recommend.d +%exclude %{python3_sitelib}/tuned/gtk + +# General files %{profile_dir}/pmqos-static.py -%{profile_dir} +%{profile_dir}/functions +%{profile_dir}/recommend.d/50-tuned.conf +%{profile_dir}/defirqaffinity.py + +# Profiles included in main package - alphabetically sorted +%{profile_dir}/accelerator-performance +%{profile_dir}/balanced +%{profile_dir}/balanced +%{profile_dir}/cpu-partitioning +%{profile_dir}/desktop +%{profile_dir}/hpc-compute +%{profile_dir}/intel-sst +%{profile_dir}/latency-performance +%{profile_dir}/mssql +%{profile_dir}/network-latency +%{profile_dir}/network-throughput +%{profile_dir}/optimize-serial-console +%{profile_dir}/powersave +%{profile_dir}/throughput-performance +%{profile_dir}/virtual-guest +%{profile_dir}/virtual-host + # active_profile might be empty when built via build service, but typically # not on a real install -> better do not mark it %%ghost %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/tuned/active_profile @@ -239,8 +259,6 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' %{_sysconfdir}/tuned/active_profile %config(noreplace) %{_sysconfdir}/tuned/profile_mode %config(noreplace) %{_sysconfdir}/tuned/post_loaded_profile %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/tuned/bootcmdline -%dir %{_sysconfdir}/dbus-1 -%dir %{_sysconfdir}/dbus-1/system.d %config %{_sysconfdir}/dbus-1/system.d/com.redhat.tuned.conf %{_sysconfdir}/grub.d %{_tmpfilesdir}/tuned.conf @@ -307,6 +325,13 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' %{_sysconfdir}/tuned/active_profile %{_prefix}/lib/tuned/spectrumscale-ece %{_mandir}/man7/tuned-profiles-spectrumscale-ece.7* +%files profiles-openshift +%defattr(-,root,root,-) +%{profile_dir}/openshift-control-plane +%{profile_dir}/openshift-node +%{profile_dir}/openshift +%{_mandir}/man7/tuned-profiles-openshift.7%{?ext_man} + %files utils %license COPYING %{_bindir}/powertop2tuned