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

[JENKINS-65911] Correct JNA method signature for fcntl(2) #9026

Merged
merged 1 commit into from Mar 10, 2024
Merged

[JENKINS-65911] Correct JNA method signature for fcntl(2) #9026

merged 1 commit into from Mar 10, 2024

Conversation

basil
Copy link
Member

@basil basil commented Mar 8, 2024

While looking at JENKINS-72833 I remembered my old friend JENKINS-65911. While I could no longer reproduce the problem on my macOS system, I was able to reproduce incorrect fcntl results in a new unit test when running on macOS (but not Linux). The problem seems to be, as I wrote back in 2021, an incorrect JNA signature. fcntl is a variadic function. While I couldn't find much documentation about this, I tried using Java varargs and hoping JNA would deal with this correctly, and it did. My unit test started passing on macOS and there were no regressions running the test on Linux. Just to be sure, I stepped through the restart sequence outside of systemd in a debugger and verified in a separate terminal running strace that the system calls on Linux were unchanged. While I was here I also wrote some other tests to increase coverage for this file.

Testing done

Before this PR, new unit test failed on macOS and passed on Linux. After this PR, passes on both platforms.

Also stepped through the restart sequence outside of systemd on Linux and verified correct system call input and output in strace.

Proposed changelog entries

  • Fix a crash when restarting Jenkins on macOS.

Proposed upgrade guidelines

N/A

Submitter checklist

Edit tasklist title
Beta Give feedback Tasklist Submitter checklist, more options

Delete tasklist

Delete tasklist block?
Are you sure? All relationships in this tasklist will be removed.
  1. The Jira issue, if it exists, is well-described.
    Options
  2. The changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developers, depending on the change) and are in the imperative mood (see examples). Fill in the Proposed upgrade guidelines section only if there are breaking changes or changes that may require extra steps from users during upgrade.
    Options
  3. There is automated testing or an explanation as to why this change has no tests.
    Options
  4. New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
    Options
  5. New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
    Options
  6. New or substantially changed JavaScript is not defined inline and does not call eval to ease future introduction of Content Security Policy (CSP) directives (see documentation).
    Options
  7. For dependency updates, there are links to external changelogs and, if possible, full differentials.
    Options
  8. For new APIs and extension points, there is a link to at least one consumer.
    Options

Desired reviewers

@mention

Before the changes are marked as ready-for-merge:

Maintainer checklist

Edit tasklist title
Beta Give feedback Tasklist Maintainer checklist, more options

Delete tasklist

Delete tasklist block?
Are you sure? All relationships in this tasklist will be removed.
  1. There are at least two (2) approvals for the pull request and no outstanding requests for change.
    Options
  2. Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
    Options
  3. Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
    Options
  4. Proper changelog labels are set so that the changelog can be generated automatically.
    Options
  5. If the change needs additional upgrade steps from users, the upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the pull request title (see example).
    Options
  6. If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).
    Options

@basil basil added the bug For changelog: Minor bug. Will be listed after features label Mar 8, 2024
basil
basil commented Mar 8, 2024
View reviewed changes
core/src/test/java/hudson/util/jna/GNUCLibraryTest.java
public class GNUCLibraryTest {

private static final int EBADF = 9;
private static final int O_CREAT = "Linux".equals(System.getProperty("os.name")) ? 64 : 512;
Copy link
Member Author

Choose a reason for hiding this comment

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

https://github.com/jart/cosmopolitan/blob/1.0/libc/sysv/consts.sh#L170

NotMyFault
NotMyFault approved these changes Mar 9, 2024
View reviewed changes
Copy link
Member

@NotMyFault NotMyFault left a comment

Choose a reason for hiding this comment

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

Interesting finding and analysis 👀

@NotMyFault NotMyFault added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label Mar 9, 2024
StefanSpieker
StefanSpieker approved these changes Mar 9, 2024
View reviewed changes
Copy link
Contributor

@StefanSpieker StefanSpieker left a comment

Choose a reason for hiding this comment

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

Thanks for the reasoning and detailed explanation

@MarkEWaite
Copy link
Contributor

This PR is now ready for merge. We will merge it after approximately 24 hours if there is no negative feedback.

timja
timja approved these changes Mar 9, 2024
View reviewed changes
Copy link
Member

@timja timja left a comment •
edited

Choose a reason for hiding this comment

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

@NotMyFault NotMyFault merged commit c9af352 into jenkinsci:master Mar 10, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarkEWaite MarkEWaite MarkEWaite approved these changes

@NotMyFault NotMyFault NotMyFault approved these changes

@timja timja timja approved these changes

@StefanSpieker StefanSpieker StefanSpieker approved these changes

Assignees
No one assigned
Labels
bug For changelog: Minor bug. Will be listed after features ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback
Projects
None yet
Milestone
No milestone
5 participants
@basil @MarkEWaite @NotMyFault @timja @StefanSpieker