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-23792] Do not terminate stopped EC2 nodes that were just booted #632

Merged
merged 8 commits into from
Jun 18, 2021
Merged

[JENKINS-23792] Do not terminate stopped EC2 nodes that were just booted #632

merged 8 commits into from
Jun 18, 2021

Commits on Jun 14, 2021

  1. regression, do not terminate stopped EC2 nodes that were just booted … 

    …again

when a node just booted it is not connected, and simultaneously its idle start time
could still be set to the last time the node was booted. If the instance is checked by the plugin while in this phase, the plugin will erroneously decide to terminate it again. The change in this PR adds a safety check to ensure that
idle time is calculated from the greatest of idle time as returned by jenkins or the node uptime, as returned by EC2.

Fixes: https://issues.jenkins.io/browse/JENKINS-23792
    @unicolet
    unicolet committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    8867fe6 View commit details
    Browse the repository at this point in the history

  2. get launch time the right way

    @unicolet
    unicolet committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    9a6d9e3 View commit details
    Browse the repository at this point in the history

  3. move test into its own test case

    @unicolet
    unicolet committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    62c3dc9 View commit details
    Browse the repository at this point in the history

  4. remove old test case, which was moved into its own method a few lines… 

    … below
    @unicolet
    unicolet committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    61667eb View commit details
    Browse the repository at this point in the history

  5. rename launchedAtMs to getLaunchTime

    @unicolet
    unicolet committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    9fa24ba View commit details
    Browse the repository at this point in the history

  6. provide valid test case for issue fixed by this PR https://issues.jen… 

    …kins.io/browse/JENKINS-23792
    @unicolet
    unicolet committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    1f188ef View commit details
    Browse the repository at this point in the history

  7. wording

    @unicolet
    unicolet committed Jun 14, 2021
    Configuration menu
    Copy the full SHA
    90592b8 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2021

  1. fix reason for assertion

    @unicolet
    unicolet committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    3bcb58c View commit details
    Browse the repository at this point in the history