Skip to content

Commit

Permalink
Ship the latest TuneD, adjust default Tuned CR.
Browse files Browse the repository at this point in the history
This PR ships the latest TuneD daemon.

Other changes:
  - adjust the openshift-tuned code to reflect the upstream project
    renaming
  - adjust the default Tuned CR to work with kernels 5.13+ (see
    rhbz#1952687)
  • Loading branch information
jmencak committed Jul 5, 2021
1 parent 68c42b2 commit 5eab983
Show file tree
Hide file tree
Showing 100 changed files with 699 additions and 484 deletions.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -14,7 +14,7 @@ REV=$(shell git describe --long --tags --match='v*' --always --dirty)

# Upstream tuned daemon variables
TUNED_REPO:=https://github.com/redhat-performance/tuned.git
TUNED_COMMIT:=01fecec1d1a652489387a071c7cc7351b1638699
TUNED_COMMIT:=7fc63d571abf5a18c234358cf15b6b50c9b14906
TUNED_DIR:=daemon

# API-related variables
Expand Down
1 change: 1 addition & 0 deletions assets/tuned/daemon/.packit.yaml
@@ -1,3 +1,4 @@
upstream_tag_template: v{version}
jobs:
- job: copr_build
trigger: pull_request
Expand Down
12 changes: 6 additions & 6 deletions assets/tuned/daemon/CONTRIBUTING.md
@@ -1,10 +1,10 @@
Contributing to Tuned
Contributing to TuneD
=====================

Submitting patches
------------------

All patches should be based on the most recent revision of Tuned, which is
All patches should be based on the most recent revision of TuneD, which is
available on [GitHub](https://github.com/redhat-performance/tuned).

Patches should be created using `git` and the commit message should generally
Expand Down Expand Up @@ -48,8 +48,8 @@ consist of three parts:
If you use `git commit -s`, `git` will add the tag for you.

Every patch should represent a single logical change. On the one hand, each
patch should be complete enough so that after applying it, the Tuned repository
remains in a consistent state and Tuned remains, to the best of the
patch should be complete enough so that after applying it, the TuneD repository
remains in a consistent state and TuneD remains, to the best of the
contributor's knowledge, completely functional (a corollary of this is that
when making fixes to your pull request on GitHub, you should include the fixes
in the commits where they logically belong rather than appending new commits).
Expand All @@ -59,8 +59,8 @@ separated into individual ones.

Patches can either be submitted in the form of pull requests to the GitHub
repository, sent to the power-management (at) lists.fedoraproject.org mailing
list, or sent directly to the maintainers of the Tuned project.
list, or sent directly to the maintainers of the TuneD project.

These guidelines were inspired by the [contribution guidelines of the Linux
Kernel](https://www.kernel.org/doc/html/latest/process/submitting-patches.html).
You can find more rationale for Tuned's guidelines in that document.
You can find more rationale for TuneD's guidelines in that document.
6 changes: 3 additions & 3 deletions assets/tuned/daemon/README
@@ -1,4 +1,4 @@
Tuned: Daemon for monitoring and adaptive tuning of system devices.
TuneD: Daemon for monitoring and adaptive tuning of system devices.

(This is tuned 2.0 with a new code base. If you are looking for the older
version, please check out branch '1.0' in our Git repository.)
Expand Down Expand Up @@ -81,7 +81,7 @@ See the file CONTRIBUTING.md for guidelines for contributing.
License
-------

Copyright (C) 2008-2019 Red Hat, Inc.
Copyright (C) 2008-2021 Red Hat, Inc.

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
Expand All @@ -105,6 +105,6 @@ differently, see the file for the text of the license.

The icon:

The Tuned icon was created by Mariia Leonova <mleonova@redhat.com> and it is
The TuneD icon was created by Mariia Leonova <mleonova@redhat.com> and it is
licensed under Creative Commons Attribution-ShareAlike 3.0 license
(http://creativecommons.org/licenses/by-sa/3.0/legalcode).
8 changes: 4 additions & 4 deletions assets/tuned/daemon/bootcmdline
@@ -1,12 +1,12 @@
# This file specifies additional parameters to kernel boot command line and
# initrd overlay images. Its content is set by the Tuned bootloader plugin
# initrd overlay images. Its content is set by the TuneD bootloader plugin
# and sourced by the grub2-mkconfig (/etc/grub.d/00_tuned script).
#
# Please do not edit this file. Content of this file can be overwritten by
# switch of Tuned profile.
# switch of TuneD profile.
#
# If you need to add parameters to the kernel boot command line, create
# Tuned profile containing the following:
# TuneD profile containing the following:
#
# [bootloader]
# cmdline = YOUR_ADDITIONAL_KERNEL_PARAMETERS
Expand All @@ -22,7 +22,7 @@
#
# YOUR_ADDITIONAL_KERNEL_PARAMETERS will stay preserved.
#
# Similarly if you need to add initrd overlay image, create Tuned profile
# Similarly if you need to add initrd overlay image, create TuneD profile
# containing the following:
#
# [bootloader]
Expand Down
2 changes: 1 addition & 1 deletion assets/tuned/daemon/ci.fmf
@@ -1,4 +1,4 @@
discover:
how: fmf
execute:
how: beakerlib
how: tmt
60 changes: 30 additions & 30 deletions assets/tuned/daemon/com.redhat.tuned.policy
Expand Up @@ -3,7 +3,7 @@
"http://www.freedesktop.org/software/polkit/policyconfig-1.dtd">
<policyconfig>

<vendor>Tuned</vendor>
<vendor>TuneD</vendor>
<vendor_url>https://fedorahosted.org/tuned/</vendor_url>
<icon_name>tuned</icon_name>

Expand Down Expand Up @@ -38,8 +38,8 @@
</action>

<action id="com.redhat.tuned.disable">
<description>Disable Tuned</description>
<message>Authentication is required to disable Tuned</message>
<description>Disable TuneD</description>
<message>Authentication is required to disable TuneD</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
Expand All @@ -48,8 +48,8 @@
</action>

<action id="com.redhat.tuned.is_running">
<description>Check whether Tuned is running</description>
<message>Authentication is required to check whether Tuned is running</message>
<description>Check whether TuneD is running</description>
<message>Authentication is required to check whether TuneD is running</message>
<defaults>
<allow_any>yes</allow_any>
<allow_inactive>yes</allow_inactive>
Expand All @@ -58,8 +58,8 @@
</action>

<action id="com.redhat.tuned.profile_info">
<description>Show information about Tuned profile</description>
<message>Authentication is required to show information about Tuned profile</message>
<description>Show information about TuneD profile</description>
<message>Authentication is required to show information about TuneD profile</message>
<defaults>
<allow_any>yes</allow_any>
<allow_inactive>yes</allow_inactive>
Expand All @@ -68,8 +68,8 @@
</action>

<action id="com.redhat.tuned.profiles">
<description>List Tuned profiles</description>
<message>Authentication is required to list Tuned profiles</message>
<description>List TuneD profiles</description>
<message>Authentication is required to list TuneD profiles</message>
<defaults>
<allow_any>yes</allow_any>
<allow_inactive>yes</allow_inactive>
Expand All @@ -78,8 +78,8 @@
</action>

<action id="com.redhat.tuned.profiles2">
<description>List Tuned profiles</description>
<message>Authentication is required to list Tuned profiles</message>
<description>List TuneD profiles</description>
<message>Authentication is required to list TuneD profiles</message>
<defaults>
<allow_any>yes</allow_any>
<allow_inactive>yes</allow_inactive>
Expand All @@ -88,7 +88,7 @@
</action>

<action id="com.redhat.tuned.recommend_profile">
<description>Show Tuned profile name which is recommended for your system</description>
<description>Show TuneD profile name which is recommended for your system</description>
<message>Authentication is required to show recommended profile name</message>
<defaults>
<allow_any>yes</allow_any>
Expand All @@ -98,8 +98,8 @@
</action>

<action id="com.redhat.tuned.reload">
<description>Reload Tuned configuration</description>
<message>Authentication is required to reload Tuned configuration</message>
<description>Reload TuneD configuration</description>
<message>Authentication is required to reload TuneD configuration</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
Expand All @@ -108,8 +108,8 @@
</action>

<action id="com.redhat.tuned.start">
<description>Start Tuned daemon</description>
<message>Authentication is required to start Tuned daemon</message>
<description>Start TuneD daemon</description>
<message>Authentication is required to start TuneD daemon</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
Expand All @@ -118,8 +118,8 @@
</action>

<action id="com.redhat.tuned.stop">
<description>Stop Tuned daemon</description>
<message>Authentication is required to stop Tuned daemon</message>
<description>Stop TuneD daemon</description>
<message>Authentication is required to stop TuneD daemon</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
Expand All @@ -128,8 +128,8 @@
</action>

<action id="com.redhat.tuned.switch_profile">
<description>Switch Tuned profile</description>
<message>Authentication is required to switch Tuned profile</message>
<description>Switch TuneD profile</description>
<message>Authentication is required to switch TuneD profile</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
Expand Down Expand Up @@ -168,8 +168,8 @@
</action>

<action id="com.redhat.tuned.verify_profile">
<description>Verify Tuned profile</description>
<message>Authentication is required to verify Tuned profile</message>
<description>Verify TuneD profile</description>
<message>Authentication is required to verify TuneD profile</message>
<defaults>
<allow_any>yes</allow_any>
<allow_inactive>yes</allow_inactive>
Expand All @@ -178,8 +178,8 @@
</action>

<action id="com.redhat.tuned.verify_profile_ignore_missing">
<description>Verify Tuned profile, ignore missing values</description>
<message>Authentication is required to verify Tuned profile</message>
<description>Verify TuneD profile, ignore missing values</description>
<message>Authentication is required to verify TuneD profile</message>
<defaults>
<allow_any>yes</allow_any>
<allow_inactive>yes</allow_inactive>
Expand All @@ -188,8 +188,8 @@
</action>

<action id="com.redhat.tuned.get_all_plugins">
<description>Get plugins which Tuned daemon can acces</description>
<message>Authentication is required to get Tuned plugins</message>
<description>Get plugins which TuneD daemon can acces</description>
<message>Authentication is required to get TuneD plugins</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
Expand All @@ -198,8 +198,8 @@
</action>

<action id="com.redhat.tuned.get_plugin_documentation">
<description>Get documentation of tuned plugin</description>
<message>Authentication is required to get documentation of tuned plugin</message>
<description>Get documentation of TuneD plugin</description>
<message>Authentication is required to get documentation of TuneD plugin</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
Expand All @@ -208,8 +208,8 @@
</action>

<action id="com.redhat.tuned.get_plugin_hints">
<description>Get hints for parameters of Tuned plugin</description>
<message>Authentication is required to get hints for parameters of Tuned plugin</message>
<description>Get hints for parameters of TuneD plugin</description>
<message>Authentication is required to get hints for parameters of TuneD plugin</message>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
Expand Down
2 changes: 1 addition & 1 deletion assets/tuned/daemon/contrib/sysvinit/tuned
Expand Up @@ -10,7 +10,7 @@
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# X-Interactive: false
# Short-Description: Tuned daemon
# Short-Description: TuneD daemon
# Description: Dynamic System Tuning Daemon
### END INIT INFO
# PATH should only include /usr/* if it runs after the mountnfs.sh script
Expand Down
10 changes: 5 additions & 5 deletions assets/tuned/daemon/doc/manual/README.adoc
@@ -1,6 +1,6 @@
= About this documentation

This directory contains source files of Tuned documentation intended for system administrators.
This directory contains source files of TuneD documentation intended for system administrators.

== Building the source

Expand All @@ -18,16 +18,16 @@ The `master.adoc` file is the main entry point for the documentation. It _includ

== Naming conventions

Use the following naming conventions when referring to Tuned and its components in the documentation:
Use the following naming conventions when referring to TuneD and its components in the documentation:

* "the *Tuned* application", referring to the complete set of software, including executables, profiles, scripts, documentation, artwork, etc. Written as `the \*Tuned* application` in AsciiDoc, because application names are in bold text.
* "the *TuneD* application", referring to the complete set of software, including executables, profiles, scripts, documentation, artwork, etc. Written as `the \*TuneD* application` in AsciiDoc, because application names are in bold text.

* "the Tuned project", referring to the developers and contributors, the web pages, repositories, planning, etc.
* "the TuneD project", referring to the developers and contributors, the web pages, repositories, planning, etc.

* "the `tuned` service", referring to the `tuned.service` systemd unit and the `tuned` executable

* "the `tuned-adm` utility", referring to the `tuned-adm` executable

* "the `tuned` and `tuned-adm` commands", referring to the text typed into the terminal to run components of Tuned
* "the `tuned` and `tuned-adm` commands", referring to the text typed into the terminal to run components of TuneD

This is consistent with other naming schemes. For example, consider "the Firefox application" vs. "the `firefox` command".
@@ -1,15 +1,15 @@
:parent-context-of-customizing-tuned-profiles: {context}

[id='customizing-tuned-profiles_{context}']
= Customizing Tuned profiles
= Customizing TuneD profiles

:context: customizing-tuned-profiles

You can create or modify *Tuned* profiles to optimize system performance for your intended use case.
You can create or modify *TuneD* profiles to optimize system performance for your intended use case.

.Prerequisites

* Install and enable *Tuned* as described in xref:installing-and-enabling-tuned_getting-started-with-tuned[].
* Install and enable *TuneD* as described in xref:installing-and-enabling-tuned_getting-started-with-tuned[].


include::modules/performance/con_tuned-profiles.adoc[leveloffset=+1]
Expand Down Expand Up @@ -37,6 +37,6 @@ include::modules/performance/proc_setting-the-disk-scheduler-using-tuned.adoc[le
== Related information

* The `tuned.conf(5)` man page
* The *Tuned* project website: link:https://tuned-project.org/[]
* The *TuneD* project website: link:https://tuned-project.org/[]

:context: {parent-context-of-customizing-tuned-profiles}
@@ -1,11 +1,11 @@
:parent-context-of-getting-started-with-tuned: {context}

[id='getting-started-with-tuned_{context}']
= Getting started with Tuned
= Getting started with TuneD

:context: getting-started-with-tuned

As a system administrator, you can use the *Tuned* application to optimize the performance profile of your system for a variety of use cases.
As a system administrator, you can use the *TuneD* application to optimize the performance profile of your system for a variety of use cases.

// .Prerequisites
//
Expand Down Expand Up @@ -38,6 +38,6 @@ include::modules/performance/proc_disabling-tuned.adoc[leveloffset=+1]

* The `tuned(8)` man page
* The `tuned-adm(8)` man page
* The *Tuned* project website: link:https://tuned-project.org/[]
* The *TuneD* project website: link:https://tuned-project.org/[]

:context: {parent-context-of-getting-started-with-tuned}
6 changes: 3 additions & 3 deletions assets/tuned/daemon/doc/manual/master.adoc
Expand Up @@ -3,10 +3,10 @@
:keywords: documentation, tuned, performance, power, linux
:toc:

// The revnumber attribute is intended to show the Tuned version for which the document has been updated
// The revnumber attribute is intended to show the TuneD version for which the document has been updated

[id="{tuned-documentation}"]
= Tuned documentation: Optimizing system throughput, latency, and power consumption
= TuneD documentation: Optimizing system throughput, latency, and power consumption

// Load externally defined attributes
include::meta/attributes.adoc[]
Expand All @@ -19,7 +19,7 @@ include::meta/attributes.adoc[]

// Abstract (Preamble):

This documentation explains how to use the *Tuned* application to monitor and optimize the throughput, latency, and power consumption of your system in different scenarios.
This documentation explains how to use the *TuneD* application to monitor and optimize the throughput, latency, and power consumption of your system in different scenarios.

// The following is copied from the standard Red Hat legal notice
// as used in all Red Hat documentation.
Expand Down

0 comments on commit 5eab983

Please sign in to comment.