interfaces/systemd: use batch systemd operations #11372
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Ondrej Kubik <ondrej.kubik@canonical.com>
Signed-off-by: Ondrej Kubik <ondrej.kubik@canonical.com>
Drop the changes that require new API calls to DaemonReloadIfNeeded(), and only enable batched operations. Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
Codecov Report
@@ Coverage Diff @@
## master #11372 +/- ##
==========================================
- Coverage 78.36% 78.35% -0.01%
==========================================
Files 931 931
Lines 106558 106569 +11
==========================================
+ Hits 83499 83507 +8
- Misses 17859 17861 +2
- Partials 5200 5201 +1
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
mvo5
reviewed
Feb 10, 2022
interfaces/systemd/backend.go
Outdated
| } | ||
| } | ||
| } | ||
| if 0 < len(disableUnits) { |
There was a problem hiding this comment.
(nitpick) this is slightly unusual, we usually have if len(disableUnits) > 0 (same below)
There was a problem hiding this comment.
Pushed a tweak, thanks!
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
…interface-backend-batch
mardy
approved these changes
Feb 11, 2022
interfaces/systemd/backend.go
Outdated
| if err := systemd.Enable(serviceUnits); err != nil { | ||
| logger.Noticef("cannot enable service %q: %s", service, err) | ||
| if len(changed) > 0 { | ||
| // Ensure the service is running right now and on reboots |
There was a problem hiding this comment.
Nitpick: this comment should use the plural now.
interfaces/systemd/backend.go
Outdated
| if len(removed) > 0 { | ||
| logger.Noticef("systemd-backend: Disable: removed services: %q", removed) | ||
| if err := systemd.Disable(removed); err != nil { | ||
| logger.Noticef("cannot disable service %q: %s", removed, err) |
There was a problem hiding this comment.
nitpick: this message should now say "services"
interfaces/systemd/backend.go
Outdated
| if err := systemd.Stop(serviceUnits, 5*time.Second); err != nil { | ||
| logger.Noticef("cannot stop service %q: %s", service, err) | ||
| if err := systemd.Stop(removed, 5*time.Second); err != nil { | ||
| logger.Noticef("cannot stop service %q: %s", removed, err) |
interfaces/systemd/backend.go
Outdated
| } | ||
| } | ||
| } | ||
| if len(disableUnits) > 0 { | ||
| if err := systemd.Disable(disableUnits); err != nil { | ||
| logger.Noticef("cannot disable service %q: %s", disableUnits, err) |
interfaces/systemd/backend.go
Outdated
| } | ||
| if len(stopUnits) > 0 { | ||
| if err := systemd.Stop(stopUnits, 5*time.Second); err != nil { | ||
| logger.Noticef("cannot stop service %q: %s", stopUnits, err) |
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
Signed-off-by: Maciej Borzecki <maciej.zenon.borzecki@canonical.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The PR cherry picks some of the changes from #10463, and some test tweaks from #11353. The main change calling systemd to operate on services in batch, rather than one by one.
cc @kubiko