thermald: fix default preference to ENERGY_CONSERVE

[Colin Ian King]

[SRU][XENIAL][YAKKETY][ZESTY]

Upstream thermald includes a minor fixes that ensure settings are initialized correctly. The fix in question is:

commit 37a25879239466f2d096fd1a58b2ac7bbc3958f5
Author: Srinivas Pandruvada <email address hidden>
Date: Mon Mar 27 17:39:30 2017 -0700

    set default preference

    In case there is missing element for preference, set ENERGY_CONSERVE
    as default.

This fixes are not critical, but I think are proven stable enough for a SRU and it plugs a *potential* issue that we've not yet seen to occur.

[REGRESSION POTENTIAL]
Minimal, this ensures a default setting is correctly set to the default value when config is provided without a default preference. Since this is not the normal modus operandi of thermald since it uses zero config mode, this fix plugs a corner case that not used by default. Users of the xml config will be entering this default appropriately, so this catches the corner cases where it is not defined in a user config.

[TEST]
This is not testable in the default zero config case. In cases where the config does not have this default setting, it is hard to test as this is sets internal state that is not easily checked during run time. As this bug has not been observed in the field, it is hard to find a reproducer to test this corner case.

[Andy Whitcroft (apw)]

An upload of thermald to zesty-proposed has been rejected from the upload queue for the following reason: "Contains .pc junk, will be reuploaded.".

[Andy Whitcroft (apw)]

Hello Colin, or anyone else affected,

Accepted thermald into zesty-proposed. The package will build now and be available at https://launchpad.net/ubuntu/+source/thermald/1.5.4-4ubuntu1 in a few hours, and then in the -proposed repository.

Please help us by testing this new package. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation on how to enable and use -proposed.Your feedback will aid us getting this update out to other Ubuntu users.

If this package fixes the bug for you, please add a comment to this bug, mentioning the version of the package you tested, and change the tag from verification-needed to verification-done. If it does not fix the bug for you, please add a comment stating that, and change the tag to verification-failed. In either case, details of your testing will help us make a better decision.

Further information regarding the verification process can be found at https://wiki.ubuntu.com/QATeam/PerformingSRUVerification . Thank you in advance!

[Andy Whitcroft (apw)]

Hello Colin, or anyone else affected,

Accepted thermald into yakkety-proposed. The package will build now and be available at https://launchpad.net/ubuntu/+source/thermald/1.5.3-4ubuntu2 in a few hours, and then in the -proposed repository.

Please help us by testing this new package. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation on how to enable and use -proposed.Your feedback will aid us getting this update out to other Ubuntu users.

If this package fixes the bug for you, please add a comment to this bug, mentioning the version of the package you tested, and change the tag from verification-needed to verification-done. If it does not fix the bug for you, please add a comment stating that, and change the tag to verification-failed. In either case, details of your testing will help us make a better decision.

Further information regarding the verification process can be found at https://wiki.ubuntu.com/QATeam/PerformingSRUVerification . Thank you in advance!

[Andy Whitcroft (apw)]

Hello Colin, or anyone else affected,

Accepted thermald into xenial-proposed. The package will build now and be available at https://launchpad.net/ubuntu/+source/thermald/1.5-2ubuntu4 in a few hours, and then in the -proposed repository.

Please help us by testing this new package. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation on how to enable and use -proposed.Your feedback will aid us getting this update out to other Ubuntu users.

If this package fixes the bug for you, please add a comment to this bug, mentioning the version of the package you tested, and change the tag from verification-needed to verification-done. If it does not fix the bug for you, please add a comment stating that, and change the tag to verification-failed. In either case, details of your testing will help us make a better decision.

Further information regarding the verification process can be found at https://wiki.ubuntu.com/QATeam/PerformingSRUVerification . Thank you in advance!

[Colin Ian King (colin-king)]

Tested with xenial -proposed, no regressions found, thermal trip works fine on a Lenovo X220.

[Colin Ian King (colin-king)]

Soak tested with yakkety -proposed, no regressions found, thermal trip works fine on a Lenovo X220.

[Colin Ian King (colin-king)]

Soak tested with zesty -proposed, no regressions found, thermal trip works fine on a Lenovo X220.

All soak tests for Xenial, Yakkety and Zesty involved running "sudo stress-ng --ignite-cpu --matrix 0 -v" for 15 minutes. No regressions in behaviour were observed in the thermald log. I ran thermald with the highest log debug level to observe the thermald behaviour.

Passed. No regressions.

[Launchpad Janitor (janitor)]

This bug was fixed in the package thermald - 1.5.4-4ubuntu1

---------------
thermald (1.5.4-4ubuntu1) zesty; urgency=medium

   * Add missing support for Kabylake and Broadwell-GT (LP: #1683829)
    - upstream commit 405dcc0a6464d92, add some more CPU IDs
   * Fix energy preference default (LP: #1683825)
    - 37a25879239466f ("set default preference"); set the default
      energy preference to ENERGY_CONSERVE rather than a garbage value

 -- Colin King <email address hidden> Tue, 18 Apr 2017 15:42:01 +0100

[Launchpad Janitor (janitor)]

This bug was fixed in the package thermald - 1.5.4-4ubuntu1

---------------
thermald (1.5.4-4ubuntu1) zesty; urgency=medium

   * Add missing support for Kabylake and Broadwell-GT (LP: #1683829)
    - upstream commit 405dcc0a6464d92, add some more CPU IDs
   * Fix energy preference default (LP: #1683825)
    - 37a25879239466f ("set default preference"); set the default
      energy preference to ENERGY_CONSERVE rather than a garbage value

 -- Colin King <email address hidden> Tue, 18 Apr 2017 15:42:01 +0100

[Andy Whitcroft (apw)]

The verification of the Stable Release Update for thermald has completed successfully and the package has now been released to -updates. Subsequently, the Ubuntu Stable Release Updates Team is being unsubscribed and will not receive messages about this bug report. In the event that you encounter a regression using the package from -updates please report a new bug using ubuntu-bug and tag the bug report regression-update so we can easily find any regressions.

[Launchpad Janitor (janitor)]

This bug was fixed in the package thermald - 1.5.3-4ubuntu2

---------------
thermald (1.5.3-4ubuntu2) yakkety; urgency=medium

   * Add missing support for Kabylake and Broadwell-GT (LP: #1683829)
    - upstream commit 405dcc0a6464d92, add some more CPU IDs
   * Fix energy preference default (LP: #1683825)
    - 37a25879239466f ("set default preference"); set the default
      energy preference to ENERGY_CONSERVE rather than a garbage value

 -- Colin King <email address hidden> Tue, 18 Apr 2017 15:42:01 +0100

[Launchpad Janitor (janitor)]

This bug was fixed in the package thermald - 1.5-2ubuntu4

---------------
thermald (1.5-2ubuntu4) xenial; urgency=medium

   * Add missing support for Kabylake and Broadwell-GT (LP: #1683829)
    - upstream commit 405dcc0a6464d92, add some more CPU IDs
   * Fix energy preference default (LP: #1683825)
    - 37a25879239466f ("set default preference"); set the default
      energy preference to ENERGY_CONSERVE rather than a garbage value

 -- Colin King <email address hidden> Tue, 18 Apr 2017 15:42:01 +0100