fix systemd_service.get_enabled, get_disabled and get_static on newer systemd version #59525

Vaarlion · 2021-02-17T15:38:02Z

What does this PR do?

This PR fix systemd_service.get_enabled, get_disabled and get_static on newer systemd version

in older systemd version, the output of list-unit-files looked like this

boot-complete.target                                                    static                                                                                                                                                                
cryptsetup-pre.target                                                   static                                                                                                                                                                
cryptsetup.target                                                       static                                                                                                                                                                
ctrl-alt-del.target                                                     disabled                                                                                                                                                              
default.target                                                          static                                                                                                                                                                
emergency.target                                                        static                                                                                                                                                                
exit.target                                                             disabled                                                                                                                                                              
final.target                                                            static                                                                                                                                                                
getty-pre.target                                                        static                                                                                                                                                                
getty.target                                                            static                                                                                                                                                                
graphical.target                                                        static                                                                                                                                                                
halt.target                                                             disabled

with only 2 fields, The unit name and the enabled state.
On newer version of systemd, they added a new field, the VENDOR_PRESET

boot-efi.mount                                       generated       -            
boot.mount                                           generated       -            
dev-hugepages.mount                                  static          -            
dev-mqueue.mount                                     static          -            
home-guillaumedk-.steam-library.mount                enabled         disabled     
home-guillaumedk-Nas.mount                           disabled        disabled     
home.mount                                           generated       -            
mnt-media.mount                                      disabled        disabled     
proc-fs-nfsd.mount                                   static          -            
proc-sys-fs-binfmt_misc.mount                        disabled        disabled     
run-vmblock\x2dfuse.mount                            disabled        disabled     
sys-fs-fuse-connections.mount                        static          -            
sys-kernel-config.mount                              static          -            
sys-kernel-debug.mount                               static          -

Resulting in issue when parsed by this module.
unit_state would look like 'static -'

This fix allow any number of field to be split, but only keep the first 2.

What issues does this PR fix or reference?

Fixes: #59526

Previous Behavior

~$ sudo salt-call service.get_static
local:

New Behavior

~$ sudo salt-call service.get_static
local:
    - apt-daily
    - apt-daily-upgrade
    - auth-rpcgss-module
    - basic.target
    - blockdev@.target
    - bluetooth.target
    - boot-complete.target
    - container-getty@
    - cryptsetup-pre.target
    - cryptsetup.target
    - dbus
    - dbus.socket
    - dev-hugepages.mount
...

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Docs
Changelog - https://docs.saltstack.com/en/master/topics/development/changelog.html
Tests written/updated

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

sagetherage · 2021-02-17T16:19:32Z

@Vaarlion we no longer use the develop branch please point this to master

twangboy

Please add some tests for the two different outputs to unit/modules/test_systemd_service.py

Also, please rebase this against the master branch. Develop is no longer used...

Vaarlion · 2021-02-17T19:49:54Z

Dammit ! i explicitly rebased from master to develop :(

in older systemd version, the output of list-unit-files looked like this ``` boot-complete.target static cryptsetup-pre.target static cryptsetup.target static ctrl-alt-del.target disabled default.target static emergency.target static exit.target disabled final.target static getty-pre.target static getty.target static graphical.target static halt.target disabled ``` with only 2 fields, The unit name and the enabled state. On newer version of systemd, they added a new field, the VENDOR_PRESET ``` boot-efi.mount generated - boot.mount generated - dev-hugepages.mount static - dev-mqueue.mount static - home-guillaumedk-.steam-library.mount enabled disabled home-guillaumedk-Nas.mount disabled disabled home.mount generated - mnt-media.mount disabled disabled proc-fs-nfsd.mount static - proc-sys-fs-binfmt_misc.mount disabled disabled run-vmblock\x2dfuse.mount disabled disabled sys-fs-fuse-connections.mount static - sys-kernel-config.mount static - sys-kernel-debug.mount static - ``` Resulting in issue when parsed by this script. `unit_state` would look like `'static -'` This fix allow any number of field to be split, but only keep the first 2.

Vaarlion · 2021-02-17T22:12:27Z

Please add some tests for the two different outputs to unit/modules/test_systemd_service.py

Also, please rebase this against the master branch. Develop is no longer used...

test have been added and the pre-commit did some cleanup.
EDIT: The test don't work, and right now i have no idea what those BAZ are supposed to be ...

Vaarlion · 2021-02-18T13:43:05Z

sorry for all the noise.
I had to look how to run test locally
I don't get how, but somehow the fake service foo have to be ignored, bar disable et baz enable.
I've just matched the test to that, but i have no idea how it work so i couldn't add quxfor static.

I hop this is enough

sagetherage · 2021-02-18T22:42:31Z

looking good! I have updated the labels to reflect all your work and thank you!!

sagetherage · 2021-02-18T22:45:44Z

it would be nice to get a changelog file since this fixes a bug @Vaarlion

twangboy · 2021-02-18T22:47:22Z

@Vaarlion Does this change break those functions on older systemd versions? Or does it now handle both? Can you test the for the old system and for the new system?

Vaarlion · 2021-02-18T23:13:36Z

it would be nice to get a changelog file since this fixes a bug @Vaarlion

I was confused about changelog, reading that those should only be done when in a release ? I'll look into it 👍

@Vaarlion Does this change break those functions on older systemd versions? Or does it now handle both? Can you test the for the old system and for the new system?

The change allow to work with both the old and new format, and the test are making sure both will work down the line.
I believe there is no reason to remove support anytime soon :D

Vaarlion · 2021-02-22T10:47:58Z

Is that changelog good enough ?

Vaarlion mentioned this pull request Feb 17, 2021

[BUG] module service.get_enabled/disabled/static nolonger work with latest systemd #59526

Closed

Vaarlion changed the title ~~WIP: fix systemd_service.get_enabled, get_disabled and get_static on newer systemd version~~ fix systemd_service.get_enabled, get_disabled and get_static on newer systemd version Feb 17, 2021

Vaarlion marked this pull request as ready for review February 17, 2021 16:03

Vaarlion requested a review from a team as a code owner February 17, 2021 16:03

Vaarlion requested review from twangboy and removed request for a team February 17, 2021 16:03

sagetherage added the develop Pointing to develop branch; needs rebase label Feb 17, 2021

twangboy requested changes Feb 17, 2021

View reviewed changes

sagetherage added the needs-testcase PR needs test cases written, or the issue is about a bug/feature that needs test cases label Feb 17, 2021

Vaarlion force-pushed the systemd_service_get-issue branch from 7d2cb96 to e925198 Compare February 17, 2021 20:04

Vaarlion changed the base branch from develop to master February 17, 2021 20:04

add test for the new output

dc0d186

Vaarlion added 2 commits February 18, 2021 00:43

reorder test result

27b4bac

Rewrite test result based on test output

818b786

sagetherage removed develop Pointing to develop branch; needs rebase needs-testcase PR needs test cases written, or the issue is about a bug/feature that needs test cases labels Feb 18, 2021

sagetherage requested a review from twangboy February 18, 2021 22:41

sagetherage added the Aluminium Release Post Mg and Pre Si label Feb 18, 2021

twangboy previously approved these changes Feb 19, 2021

View reviewed changes

Add changelog

a81de5b

Vaarlion dismissed twangboy’s stale review via a81de5b February 22, 2021 10:47

Vaarlion added 2 commits February 22, 2021 21:11

Merge branch 'master' into systemd_service_get-issue

2108203

Merge branch 'master' into systemd_service_get-issue

1dfd439

sagetherage requested a review from twangboy February 23, 2021 21:35

twangboy approved these changes Feb 23, 2021

View reviewed changes

xeacott approved these changes Feb 24, 2021

View reviewed changes

Ch3LL approved these changes Feb 24, 2021

View reviewed changes

Ch3LL merged commit dbb3158 into saltstack:master Feb 24, 2021

Vaarlion deleted the systemd_service_get-issue branch February 24, 2021 13:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix systemd_service.get_enabled, get_disabled and get_static on newer systemd version #59525

fix systemd_service.get_enabled, get_disabled and get_static on newer systemd version #59525

Uh oh!

Vaarlion commented Feb 17, 2021 •

edited

Loading

Uh oh!

sagetherage commented Feb 17, 2021

Uh oh!

twangboy left a comment •

edited

Loading

Uh oh!

Vaarlion commented Feb 17, 2021

Uh oh!

Vaarlion commented Feb 17, 2021 •

edited

Loading

Uh oh!

Vaarlion commented Feb 18, 2021

Uh oh!

sagetherage commented Feb 18, 2021

Uh oh!

sagetherage commented Feb 18, 2021

Uh oh!

twangboy commented Feb 18, 2021 •

edited

Loading

Uh oh!

Vaarlion commented Feb 18, 2021

Uh oh!

Vaarlion commented Feb 22, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

fix systemd_service.get_enabled, get_disabled and get_static on newer systemd version #59525

fix systemd_service.get_enabled, get_disabled and get_static on newer systemd version #59525

Uh oh!

Conversation

Vaarlion commented Feb 17, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

What issues does this PR fix or reference?

Previous Behavior

New Behavior

Merge requirements satisfied?

Commits signed with GPG?

Uh oh!

sagetherage commented Feb 17, 2021

Uh oh!

twangboy left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Vaarlion commented Feb 17, 2021

Uh oh!

Vaarlion commented Feb 17, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Vaarlion commented Feb 18, 2021

Uh oh!

sagetherage commented Feb 18, 2021

Uh oh!

sagetherage commented Feb 18, 2021

Uh oh!

twangboy commented Feb 18, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Vaarlion commented Feb 18, 2021

Uh oh!

Vaarlion commented Feb 22, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Vaarlion commented Feb 17, 2021 •

edited

Loading

twangboy left a comment •

edited

Loading

Vaarlion commented Feb 17, 2021 •

edited

Loading

twangboy commented Feb 18, 2021 •

edited

Loading