Merge ~peppepetra/charm-sysconfig:lp1944996 into charm-sysconfig:master

[Giuseppe Petralia]

Restart irqbalance when updating irqbalance-banned-cpus and avoid considering that a reboot is needed.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:c25b85a8b9b5e2315ac86f69a5f7099a2097518d
https://jenkins.canonical.com/bootstack/job/lp-charm-sysconfig-ci/10/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/199/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/584/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-sysconfig-ci/10//rebuild

review: Approve (continuous-integration)

[James Troup (elmo)]

Please see comment inline; you may also need to rebase on top of master?

review: Needs Fixing

[James Troup (elmo)]

LGTM - will merge once CI passes. Do we need this backported to WIP-release?

review: Approve

[Giuseppe Petralia (peppepetra)]

CI is broken for this charm atm.

Lint and unittests https://pastebin.canonical.com/p/xmxQK3XWGy/

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:6255110782944a78159bebde4aac0678999a8738
https://jenkins.canonical.com/bootstack/job/lp-charm-sysconfig-ci/12/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/201/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/586/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-sysconfig-ci/12//rebuild

review: Approve (continuous-integration)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision b7602324a8e0e85b41efc5bc697b2bd8a968c110

diff --git a/src/lib/lib_sysconfig.py b/src/lib/lib_sysconfig.py
index 3fa18a1..3032c30 100644
--- a/src/lib/lib_sysconfig.py
+++ b/src/lib/lib_sysconfig.py
@@ -497,6 +497,7 @@ class SysConfigHelper:
         if self.irqbalance_banned_cpus:
             context["irqbalance_banned_cpus"] = self.irqbalance_banned_cpus
         self._render_boot_resource(IRQBALANCE_CONF_TMPL, IRQBALANCE_CONF, context)
+        host.service_restart("irqbalance")
         hookenv.log("irqbalance configuration updated")
 
     def remove_grub_configuration(self):
@@ -565,8 +566,9 @@ class SysConfigHelper:
         )
         host.service_restart("cpufrequtils")
 
-    def remove_irqbalance_conifguration(self):
+    def remove_irqbalance_configuration(self):
         """Remove config from /etc/default/irqbalance."""
         context = {}
         self._render_boot_resource(IRQBALANCE_CONF_TMPL, IRQBALANCE_CONF, context)
+        host.service_restart("irqbalance")
         hookenv.log("irqbalance configuration deleted")
diff --git a/src/reactive/sysconfig.py b/src/reactive/sysconfig.py
index 7aed3c3..1861540 100644
--- a/src/reactive/sysconfig.py
+++ b/src/reactive/sysconfig.py
@@ -160,7 +160,7 @@ def update_status():
     if is_flag_set("sysconfig.unsupported"):
         return
 
-    resources = [KERNEL, SYSTEMD_SYSTEM, GRUB_CONF, IRQBALANCE_CONF]
+    resources = [KERNEL, SYSTEMD_SYSTEM, GRUB_CONF]
     boot_changes = SysConfigHelper.boot_resources.resources_changed_since_boot(
         resources
     )
@@ -193,6 +193,6 @@ def remove_configuration():
     syshelper.remove_grub_configuration()
     syshelper.remove_systemd_configuration()
     syshelper.remove_resolved_configuration()
-    syshelper.remove_irqbalance_conifguration()
+    syshelper.remove_irqbalance_configuration()
     clear_flag("sysconfig.installed")
     clear_flag("sysconfig.unsupported")
diff --git a/src/tests/unit/test_lib.py b/src/tests/unit/test_lib.py
index 682245e..b7eea0c 100644
--- a/src/tests/unit/test_lib.py
+++ b/src/tests/unit/test_lib.py
@@ -551,10 +551,11 @@ class TestLib:
 
         apt_install.assert_not_called()
 
+    @mock.patch("lib_sysconfig.host.service_restart")
     @mock.patch("lib_sysconfig.hookenv.config")
     @mock.patch("lib_sysconfig.hookenv.log")
     @mock.patch("lib_sysconfig.render")
-    def test_update_irqbalance_file(self, render, log, config):
+    def test_update_irqbalance_file(self, render, log, config, restart):
         """Update /etc/default/irqbalance.
 
         Expect file is rendered with correct config.
@@ -576,6 +577,8 @@ class TestLib:
             context=expected,
         )
 
+        restart.assert_called()
+
     @mock.patch("lib_sysconfig.hookenv.config")
     @mock.patch("lib_sysconfig.os.remove")
     @mock.patch("lib_sysconfig.hookenv.log")
@@ -754,16 +757,17 @@ class TestLib:
             "blocked", "Error parsing sysctl YAML"
         )
 
+    @mock.patch("lib_sysconfig.host.service_restart")
     @mock.patch("lib_sysconfig.hookenv.config")
     @mock.patch("lib_sysconfig.hookenv.log")
     @mock.patch("lib_sysconfig.render")
-    def test_remove_irqbalance_configuratioon(self, render, log, config):
+    def test_remove_irqbalance_configuration(self, render, log, config, restart):
         """Test remove irqbalance configuration.
 
         Expect file is rendered with empty context.
         """
         sysh = lib_sysconfig.SysConfigHelper()
-        sysh.remove_irqbalance_conifguration()
+        sysh.remove_irqbalance_configuration()
 
         render.assert_called_with(
             source=lib_sysconfig.IRQBALANCE_CONF_TMPL,
@@ -771,3 +775,5 @@ class TestLib:
             templates_dir="templates",
             context={},
         )
+
+        restart.assert_called()