Skip to content

JENKINS-66373: idle timeout should not fight with min spare instances setting #945

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

Open
sparrowt wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −2
Open

JENKINS-66373: idle timeout should not fight with min spare instances setting #945

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/main/java/hudson/plugins/ec2/EC2RetentionStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,14 @@ private long internalCheck(EC2Computer computer) {
SlaveTemplate slaveTemplate = computer.getSlaveTemplate();
if (slaveTemplate != null) {
long numberOfCurrentInstancesForTemplate = MinimumInstanceChecker.countCurrentNumberOfAgents(slaveTemplate);
if (numberOfCurrentInstancesForTemplate > 0 && numberOfCurrentInstancesForTemplate <= slaveTemplate.getMinimumNumberOfInstances()) {
//Check if we're in an active time-range for keeping minimum number of instances
long numberOfCurrentSpareInstancesForTemplate = MinimumInstanceChecker.countCurrentNumberOfSpareAgents(slaveTemplate);
boolean atOrBelowMinInstances = numberOfCurrentInstancesForTemplate > 0 && numberOfCurrentInstancesForTemplate <= slaveTemplate.getMinimumNumberOfInstances();
boolean atOrBelowMinSpareInstances = numberOfCurrentSpareInstancesForTemplate > 0 && numberOfCurrentSpareInstancesForTemplate <= slaveTemplate.getMinimumNumberOfSpareInstances();
if (atOrBelowMinInstances || atOrBelowMinSpareInstances) {
// Check if we're in an active time-range for keeping minimum number of instances
if (MinimumInstanceChecker.minimumInstancesActive(slaveTemplate.getMinimumNumberOfInstancesTimeRangeConfig())) {
// Time range is active and we are at (or below) one of the "minimum number" settings, so return here
// to avoid terminating any instances seeing as MinimumInstanceChecker will immediately re-provision
return 1;
}
}
Expand Down