Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix "executable in PATH" sysprobe #3641

Merged
merged 1 commit into from
Oct 26, 2023
Merged

Fix "executable in PATH" sysprobe #3641

merged 1 commit into from
Oct 26, 2023

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Oct 25, 2023

Description

The loop over the varargs was not capturing the loop variable correctly, so all the probes would check the same binary. Remove the loop and let callers call the function multiple times for each executable. This is less error prone. That bug was first introduced in #1784, but didn't become effective before #3409.

Fixes:

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

@twz123
Fix "executable in PATH" sysprobe
c2d5e87 
The loop over the varargs was not capturing the loop variable correctly,
so all the probes would check the same binary. Remove the loop and let
callers call the function multiple times for each executable. This is
less error prone. That bug was first introduced in 0f474b8, but didn't
become effective before 0f474b8.

Fixes: 0f474b8 ("Some new sysinfo probes")
Fixes: 19c800d ("Add sysprobe and some docs for required mount/umount")
Signed-off-by: Tom Wieczorek <[email protected]>
@twz123 twz123 added bug Something isn't working area/worker area/cli backport/release-1.28 PR that needs to be backported/cherrypicked to release-1.28 branch labels Oct 25, 2023
@twz123 twz123 requested a review from a team as a code owner October 25, 2023 10:51
kke
kke approved these changes Oct 26, 2023
View reviewed changes
Copy link
Contributor

@kke kke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks cleaner anyway.

@twz123 twz123 merged commit 297ea42 into k0sproject:main Oct 26, 2023
@twz123 twz123 deleted the sysinfo-fix-path-check branch October 26, 2023 09:56
@k0s-bot
Copy link

k0s-bot commented Oct 26, 2023

Successfully created backport PR for release-1.28:

@k0s-bot k0s-bot mentioned this pull request Oct 26, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kke kke kke approved these changes

@ncopa ncopa Awaiting requested review from ncopa ncopa is a code owner automatically assigned from k0sproject/k0s-maintainers

@juanluisvaladas juanluisvaladas Awaiting requested review from juanluisvaladas juanluisvaladas is a code owner automatically assigned from k0sproject/k0s-maintainers

Assignees
No one assigned
Labels
area/cli area/worker backport/release-1.28 PR that needs to be backported/cherrypicked to release-1.28 branch bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@twz123 @k0s-bot @kke