This repository has been archived by the owner on Jun 13, 2023. It is now read-only.
Use a more portable version of listUnits #44
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
CharlyF
reviewed
Jun 9, 2018
| @@ -46,3 +47,30 @@ func StopUnit(d *dbus.Conn, unitName string) error { | |||
| glog.Infof("Stopping systemd unit: %s ...", unitName) | |||
| return executeSystemdAction(unitName, d.StopUnit) | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
Exported method needs a comment
pkg/util/systemd_action.go
Outdated
| return nil, err | ||
| } | ||
| intersect := make(map[string]dbus.UnitStatus) | ||
| for _, elt := range allUnits { |
There was a problem hiding this comment.
Would it make sense to check the jobID of a unit collected and make sure you are not adding the same unit with a different name several times. Because "units may be known by multiple names at the same time, and hence there might be more unit names loaded than actual units behind them." (From the doc)
There was a problem hiding this comment.
I added this safety to the current code path.
I'm not sure where we could have this issue but it's easy to catch this.
Merged
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
What does this PR do?
The method
ListUnitsByNamesonly supports a systemd >= 230.See coreos/go-systemd#223
I used the generic ListUnits and @xvello tested it on systemd 229 👍
I also added the systemd prefix to the units in the manifests:
Because the link in
/run/systemd/system/p8s-kubelet.service->~/sandbox/manifest-systemd-unit/kubelet.serviceGive an unit name
kubelet.serviceinstead ofp8s-kubelet.service