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.

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

Restrict JnlpSlaveRestarterInstaller to DumbSlave #7693

Merged
merged 2 commits into from
Mar 17, 2023

Conversation

Vlatombe
Copy link
Member

@Vlatombe Vlatombe commented Mar 7, 2023

The exec was initially introduced to workaround memory leaks on long-running agents, it doesn't make sense to apply it to ephemeral nodes such as the ones managed by clouds.

Existing tests in JnlpSlaveRestarterInstallerTest still pass since they operate on static agents, unsure how I could introduce a cloud agent in test module.

See JENKINS-XXXXX.

Testing done

Proposed changelog entries

  • SlaveRestarter implementations are now only installed on static agents. Use -Djenkins.slaves.restarter.JnlpSlaveRestarterInstaller.forceInstall=true to fall back to the previous behaviour in case of any issue.

Proposed upgrade guidelines

N/A

Submitter checklist

  • The Jira issue, if it exists, is well-described.
  • 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.
  • There is automated testing or an explanation as to why this change has no tests.
  • New public classes, fields, and methods are annotated with @Restricted or have @since TODO Javadocs, as appropriate.
  • New deprecations are annotated with @Deprecated(since = "TODO") or @Deprecated(forRemoval = true, since = "TODO"), if applicable.
  • 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).
  • For dependency updates, there are links to external changelogs and, if possible, full differentials.
  • For new APIs and extension points, there is a link to at least one consumer.

Desired reviewers

@mention

Maintainer checklist

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

  • There are at least two (2) approvals for the pull request and no outstanding requests for change.
  • Conversations in the pull request are over, or it is explicit that a reviewer is not blocking the change.
  • Changelog entries in the pull request title and/or Proposed changelog entries are accurate, human-readable, and in the imperative mood.
  • Proper changelog labels are set so that the changelog can be generated automatically.
  • 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).
  • 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).

The exec was initially introduced to workaround memory leaks on
long-running agents, it doesn't make sense to apply it to ephemeral nodes
such as the ones managed by clouds.
@Vlatombe Vlatombe requested a review from jglick March 7, 2023 15:16
@jglick
Copy link
Member

jglick commented Mar 7, 2023

unsure how I could introduce a cloud agent in test module

Possible with a mock-cloud dependency, though we try to avoid adding new test plugin deps to core. I suppose it would make sense to create a stripped-down version in jenkins-test-harness analogously to jenkinsci/jenkins-test-harness#79. In fact in jenkinsci/jenkins-test-harness#344 I did just that, though this would need to be opt-in to be mergeable.

@jglick
Copy link
Member

jglick commented Mar 7, 2023

Regarding a test case with a Cloud, this seems of pretty minimal value here—it is obvious by code inspection that the installer will not run on non-DumbSlaves. It is a bit less obvious that it will still run on DumbSlaves because it relies on Computer.getNode returning non-null at the moment onOnline is called.

@Vlatombe Vlatombe added the bug For changelog: Minor bug. Will be listed after features label Mar 7, 2023
@NotMyFault NotMyFault requested a review from a team March 10, 2023 22:11
@NotMyFault NotMyFault requested a review from a team March 16, 2023 08:42
Copy link
Member

@timja timja left a comment

Choose a reason for hiding this comment

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

/label ready-for-merge


This PR is now ready for merge, after ~24 hours, we will merge it if there's no negative feedback.

Thanks!

@comment-ops-bot comment-ops-bot bot 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 16, 2023
@timja timja merged commit 28f592d into jenkinsci:master Mar 17, 2023
@Vlatombe Vlatombe deleted the restrict-JnlpSlaveRestarterInstaller branch March 20, 2023 08:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

4 participants