-
Notifications
You must be signed in to change notification settings - Fork 690
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
Added minimum uphours feature #377
base: master
Are you sure you want to change the base?
Changes from all commits
8010750
fb65164
a08f527
f872639
f3a14c8
47a5df1
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
buildPlugin(configurations: buildPlugin.recommendedConfigurations()) | ||
buildPlugin(configurations: buildPlugin.recommendedConfigurations()) |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,15 +46,15 @@ public EC2OndemandSlave(String instanceId, String description, String remoteFS, | |
@Deprecated | ||
public EC2OndemandSlave(String instanceId, String description, String remoteFS, int numExecutors, String labelString, Mode mode, String initScript, String tmpDir, String remoteAdmin, String jvmopts, boolean stopOnTerminate, String idleTerminationMinutes, String publicDNS, String privateDNS, List<EC2Tag> tags, String cloudName, boolean usePrivateDnsName, boolean useDedicatedTenancy, int launchTimeout, AMITypeData amiType) | ||
throws FormException, IOException { | ||
this(description + " (" + instanceId + ")", instanceId, description, remoteFS, numExecutors, labelString, mode, initScript, tmpDir, Collections.emptyList(), remoteAdmin, jvmopts, stopOnTerminate, idleTerminationMinutes, publicDNS, privateDNS, tags, cloudName, useDedicatedTenancy, launchTimeout, amiType, ConnectionStrategy.backwardsCompatible(usePrivateDnsName, false, false), -1); | ||
this(description + " (" + instanceId + ")", instanceId, description, remoteFS, numExecutors, labelString, mode, initScript, tmpDir, Collections.emptyList(), remoteAdmin, jvmopts, stopOnTerminate, idleTerminationMinutes, publicDNS, privateDNS, tags, cloudName, useDedicatedTenancy, launchTimeout, amiType, ConnectionStrategy.backwardsCompatible(usePrivateDnsName, false, false), -1, "0"); | ||
} | ||
|
||
@DataBoundConstructor | ||
public EC2OndemandSlave(String name, String instanceId, String description, String remoteFS, int numExecutors, String labelString, Mode mode, String initScript, String tmpDir, List<? extends NodeProperty<?>> nodeProperties, String remoteAdmin, String jvmopts, boolean stopOnTerminate, String idleTerminationMinutes, String publicDNS, String privateDNS, List<EC2Tag> tags, String cloudName, boolean useDedicatedTenancy, int launchTimeout, AMITypeData amiType, ConnectionStrategy connectionStrategy, int maxTotalUses) | ||
public EC2OndemandSlave(String name, String instanceId, String description, String remoteFS, int numExecutors, String labelString, Mode mode, String initScript, String tmpDir, List<? extends NodeProperty<?>> nodeProperties, String remoteAdmin, String jvmopts, boolean stopOnTerminate, String idleTerminationMinutes, String publicDNS, String privateDNS, List<EC2Tag> tags, String cloudName, boolean useDedicatedTenancy, int launchTimeout, AMITypeData amiType, ConnectionStrategy connectionStrategy, int maxTotalUses, String minUpHours) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here; you need to create a new constructor and mark the old one I'll note that this sort of redundancy could be avoided by using a value object as the constructor argument rather than all of its attributes, but this would require a larger effort to fix at this point. |
||
throws FormException, IOException { | ||
|
||
super(name, instanceId, description, remoteFS, numExecutors, mode, labelString, amiType.isWindows() ? new EC2WindowsLauncher() | ||
: new EC2UnixLauncher(), new EC2RetentionStrategy(idleTerminationMinutes), initScript, tmpDir, nodeProperties, remoteAdmin, jvmopts, stopOnTerminate, idleTerminationMinutes, tags, cloudName, useDedicatedTenancy, launchTimeout, amiType, connectionStrategy, maxTotalUses); | ||
: new EC2UnixLauncher(), new EC2RetentionStrategy(idleTerminationMinutes, minUpHours), initScript, tmpDir, nodeProperties, remoteAdmin, jvmopts, stopOnTerminate, idleTerminationMinutes, tags, cloudName, useDedicatedTenancy, launchTimeout, amiType, connectionStrategy, maxTotalUses); | ||
|
||
this.publicDNS = publicDNS; | ||
this.privateDNS = privateDNS; | ||
|
@@ -64,7 +64,7 @@ public EC2OndemandSlave(String name, String instanceId, String description, Stri | |
* Constructor for debugging. | ||
*/ | ||
public EC2OndemandSlave(String instanceId) throws FormException, IOException { | ||
this(instanceId, instanceId, "debug", "/tmp/hudson", 1, "debug", Mode.NORMAL, "", "/tmp", Collections.emptyList(), null, null, false, null, "Fake public", "Fake private", null, null, false, 0, new UnixData(null, null, null, null), ConnectionStrategy.PRIVATE_IP, -1); | ||
this(instanceId, instanceId, "debug", "/tmp/hudson", 1, "debug", Mode.NORMAL, "", "/tmp", Collections.emptyList(), null, null, false, null, "Fake public", "Fake private", null, null, false, 0, new UnixData(null, null, null, null), ConnectionStrategy.PRIVATE_IP, -1, "0"); | ||
} | ||
|
||
/** | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -64,6 +64,9 @@ public class EC2RetentionStrategy extends RetentionStrategy<EC2Computer> impleme | |
* billing period. | ||
*/ | ||
public final int idleTerminationMinutes; | ||
|
||
//Retains ephemeral agents for specified hours before applying "idle termination minutes" rules. | ||
public final int minUpHours; | ||
|
||
private transient ReentrantLock checkLock; | ||
private static final int STARTUP_TIME_DEFAULT_VALUE = 30; | ||
|
@@ -73,7 +76,7 @@ public class EC2RetentionStrategy extends RetentionStrategy<EC2Computer> impleme | |
String.valueOf(STARTUP_TIME_DEFAULT_VALUE)), STARTUP_TIME_DEFAULT_VALUE); | ||
|
||
@DataBoundConstructor | ||
public EC2RetentionStrategy(String idleTerminationMinutes) { | ||
public EC2RetentionStrategy(String idleTerminationMinutes, String minUpHours) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You need to keep the old constructors and mark them Also, you should use an argument type of either |
||
readResolve(); | ||
if (idleTerminationMinutes == null || idleTerminationMinutes.trim().isEmpty()) { | ||
this.idleTerminationMinutes = 0; | ||
|
@@ -87,11 +90,24 @@ public EC2RetentionStrategy(String idleTerminationMinutes) { | |
|
||
this.idleTerminationMinutes = value; | ||
} | ||
|
||
if (minUpHours == null || minUpHours.trim().isEmpty()) { | ||
this.minUpHours = 0; | ||
} else { | ||
int value = 0; | ||
try { | ||
value = Integer.parseInt(minUpHours); | ||
} catch (NumberFormatException nfe) { | ||
LOGGER.info("Malformed default minUpHours value: " + minUpHours); | ||
} | ||
|
||
this.minUpHours = value; | ||
} | ||
} | ||
|
||
|
||
EC2RetentionStrategy(String idleTerminationMinutes, Clock clock, long nextCheckAfter) { | ||
this(idleTerminationMinutes); | ||
EC2RetentionStrategy(String idleTerminationMinutes, String minUpHours, Clock clock, long nextCheckAfter) { | ||
this(idleTerminationMinutes, minUpHours); | ||
this.clock = clock; | ||
this.nextCheckAfter = nextCheckAfter; | ||
} | ||
|
@@ -161,6 +177,12 @@ private long internalCheck(EC2Computer computer) { | |
if (computer.isOffline() && uptime < TimeUnit.MINUTES.toMillis(STARTUP_TIMEOUT)) { | ||
return 1; | ||
} | ||
|
||
// Check min number of hours instance must be up - if stayed up at least that minimum. | ||
long minUpHoursInMills = TimeUnit.HOURS.toMillis(minUpHours); | ||
if (minUpHoursInMills > uptime) { | ||
return 1; | ||
} | ||
|
||
final long idleMilliseconds = this.clock.millis() - computer.getIdleStartMilliseconds(); | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -41,15 +41,15 @@ public EC2SpotSlave(String name, String spotInstanceRequestId, String descriptio | |
@Deprecated | ||
public EC2SpotSlave(String name, String spotInstanceRequestId, String description, String remoteFS, int numExecutors, Mode mode, String initScript, String tmpDir, String labelString, String remoteAdmin, String jvmopts, String idleTerminationMinutes, List<EC2Tag> tags, String cloudName, boolean usePrivateDnsName, int launchTimeout, AMITypeData amiType) | ||
throws FormException, IOException { | ||
this(description + " (" + name + ")", spotInstanceRequestId, description, remoteFS, numExecutors, mode, initScript, tmpDir, labelString, Collections.emptyList(), remoteAdmin, jvmopts, idleTerminationMinutes, tags, cloudName, launchTimeout, amiType, ConnectionStrategy.backwardsCompatible(usePrivateDnsName, false, false), -1); | ||
this(description + " (" + name + ")", spotInstanceRequestId, description, remoteFS, numExecutors, mode, initScript, tmpDir, labelString, Collections.emptyList(), remoteAdmin, jvmopts, idleTerminationMinutes, tags, cloudName, launchTimeout, amiType, ConnectionStrategy.backwardsCompatible(usePrivateDnsName, false, false), -1, "0"); | ||
} | ||
|
||
@DataBoundConstructor | ||
public EC2SpotSlave(String name, String spotInstanceRequestId, String description, String remoteFS, int numExecutors, Mode mode, String initScript, String tmpDir, String labelString, List<? extends NodeProperty<?>> nodeProperties, String remoteAdmin, String jvmopts, String idleTerminationMinutes, List<EC2Tag> tags, String cloudName, int launchTimeout, AMITypeData amiType, ConnectionStrategy connectionStrategy, int maxTotalUses) | ||
public EC2SpotSlave(String name, String spotInstanceRequestId, String description, String remoteFS, int numExecutors, Mode mode, String initScript, String tmpDir, String labelString, List<? extends NodeProperty<?>> nodeProperties, String remoteAdmin, String jvmopts, String idleTerminationMinutes, List<EC2Tag> tags, String cloudName, int launchTimeout, AMITypeData amiType, ConnectionStrategy connectionStrategy, int maxTotalUses, String minUpHours) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here, need another constructor. |
||
throws FormException, IOException { | ||
|
||
super(name, "", description, remoteFS, numExecutors, mode, labelString, amiType.isWindows() ? new EC2WindowsLauncher() : | ||
new EC2UnixLauncher(), new EC2RetentionStrategy(idleTerminationMinutes), initScript, tmpDir, nodeProperties, remoteAdmin, jvmopts, false, idleTerminationMinutes, tags, cloudName, false, launchTimeout, amiType, connectionStrategy, maxTotalUses); | ||
new EC2UnixLauncher(), new EC2RetentionStrategy(idleTerminationMinutes, minUpHours), initScript, tmpDir, nodeProperties, remoteAdmin, jvmopts, false, idleTerminationMinutes, tags, cloudName, false, launchTimeout, amiType, connectionStrategy, maxTotalUses); | ||
|
||
this.name = name; | ||
this.spotInstanceRequestId = spotInstanceRequestId; | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -140,6 +140,8 @@ public class SlaveTemplate implements Describable<SlaveTemplate> { | |
|
||
public int nextSubnet; | ||
|
||
private String minUpHours; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should be |
||
|
||
public String currentSubnetId; | ||
|
||
private transient/* almost final */Set<LabelAtom> labelSet; | ||
|
@@ -175,7 +177,7 @@ public SlaveTemplate(String ami, String zone, SpotConfiguration spotConfig, Stri | |
String instanceCapStr, String iamInstanceProfile, boolean deleteRootOnTermination, | ||
boolean useEphemeralDevices, boolean useDedicatedTenancy, String launchTimeoutStr, boolean associatePublicIp, | ||
String customDeviceMapping, boolean connectBySSHProcess, boolean monitoring, | ||
boolean t2Unlimited, ConnectionStrategy connectionStrategy, int maxTotalUses) { | ||
boolean t2Unlimited, ConnectionStrategy connectionStrategy, int maxTotalUses, String minUpHours) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Modifying the ctor this way also breaks backwards compat with groovy scripts There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do you want me to add one more overloaded constructor? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add another and deprecate the older one, is how it usually is handled. The older constructors should not take in new params and should provide a safe default. i.e the old behaviour. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here about the constructor. Same comment about the type (use |
||
|
||
if(StringUtils.isNotBlank(remoteAdmin) || StringUtils.isNotBlank(jvmopts) || StringUtils.isNotBlank(tmpDir)){ | ||
LOGGER.log(Level.FINE, "As remoteAdmin, jvmopts or tmpDir is not blank, we must ensure the user has RUN_SCRIPTS rights."); | ||
|
@@ -234,10 +236,27 @@ public SlaveTemplate(String ami, String zone, SpotConfiguration spotConfig, Stri | |
this.useEphemeralDevices = useEphemeralDevices; | ||
this.customDeviceMapping = customDeviceMapping; | ||
this.t2Unlimited = t2Unlimited; | ||
this.minUpHours = minUpHours; | ||
|
||
readResolve(); // initialize | ||
} | ||
|
||
@Deprecated | ||
public SlaveTemplate(String ami, String zone, SpotConfiguration spotConfig, String securityGroups, String remoteFS, | ||
InstanceType type, boolean ebsOptimized, String labelString, Node.Mode mode, String description, String initScript, | ||
String tmpDir, String userData, String numExecutors, String remoteAdmin, AMITypeData amiType, String jvmopts, | ||
boolean stopOnTerminate, String subnetId, List<EC2Tag> tags, String idleTerminationMinutes, | ||
String instanceCapStr, String iamInstanceProfile, boolean deleteRootOnTermination, | ||
boolean useEphemeralDevices, boolean useDedicatedTenancy, String launchTimeoutStr, boolean associatePublicIp, | ||
String customDeviceMapping, boolean connectBySSHProcess, boolean monitoring, | ||
boolean t2Unlimited, ConnectionStrategy connectionStrategy, int maxTotalUses) { | ||
this(ami, zone, spotConfig, securityGroups, remoteFS, type, ebsOptimized, labelString, mode, description, initScript, | ||
tmpDir, userData, numExecutors, remoteAdmin, amiType, jvmopts, stopOnTerminate, subnetId, tags, | ||
idleTerminationMinutes, instanceCapStr, iamInstanceProfile, deleteRootOnTermination, useEphemeralDevices, | ||
useDedicatedTenancy, launchTimeoutStr, associatePublicIp, customDeviceMapping, connectBySSHProcess, | ||
monitoring, t2Unlimited, connectionStrategy, -1, "0"); | ||
} | ||
|
||
@Deprecated | ||
public SlaveTemplate(String ami, String zone, SpotConfiguration spotConfig, String securityGroups, String remoteFS, | ||
InstanceType type, boolean ebsOptimized, String labelString, Node.Mode mode, String description, String initScript, | ||
|
@@ -416,6 +435,10 @@ public boolean getAssociatePublicIp() { | |
return associatePublicIp; | ||
} | ||
|
||
public String getMinUpHours() { | ||
return minUpHours; | ||
} | ||
|
||
@Deprecated | ||
@DataBoundSetter | ||
public void setConnectUsingPublicIp(boolean connectUsingPublicIp) { | ||
|
@@ -1102,13 +1125,13 @@ protected EC2OndemandSlave newOndemandSlave(Instance inst) throws FormException, | |
return new EC2OndemandSlave(getSlaveName(inst.getInstanceId()), inst.getInstanceId(), description, remoteFS, getNumExecutors(), labels, mode, initScript, | ||
tmpDir, Collections.emptyList(), remoteAdmin, jvmopts, stopOnTerminate, idleTerminationMinutes, inst.getPublicDnsName(), | ||
inst.getPrivateDnsName(), EC2Tag.fromAmazonTags(inst.getTags()), parent.name, | ||
useDedicatedTenancy, getLaunchTimeout(), amiType, connectionStrategy, maxTotalUses); | ||
useDedicatedTenancy, getLaunchTimeout(), amiType, connectionStrategy, maxTotalUses, minUpHours); | ||
} | ||
|
||
protected EC2SpotSlave newSpotSlave(SpotInstanceRequest sir) throws FormException, IOException { | ||
return new EC2SpotSlave(getSlaveName(sir.getSpotInstanceRequestId()), sir.getSpotInstanceRequestId(), description, remoteFS, getNumExecutors(), mode, initScript, | ||
tmpDir, labels, Collections.emptyList(), remoteAdmin, jvmopts, idleTerminationMinutes, EC2Tag.fromAmazonTags(sir.getTags()), parent.name, | ||
getLaunchTimeout(), amiType, connectionStrategy, maxTotalUses); | ||
getLaunchTimeout(), amiType, connectionStrategy, maxTotalUses, minUpHours); | ||
} | ||
|
||
/** | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -177,6 +177,10 @@ THE SOFTWARE. | |
<f:entry title="${%Maximum Total Uses}" field="maxTotalUses"> | ||
<f:textbox default="-1"/> | ||
</f:entry> | ||
|
||
<f:entry title="Minimum uptime in hours" field="minUpHours"> | ||
<f:textbox default="0" /> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should use |
||
</f:entry> | ||
|
||
</f:advanced> | ||
|
||
|
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,6 @@ | ||||||
<div> | ||||||
<p> Retains ephemeral agents for specified hours before applying "idle termination minutes" rules. | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
<p>Overrides the default termination time by adding the specified number of hours before the evaluation is calculated</p> | ||||||
<p>Time is expressed in hours - default being 0 which causes the system to behave as if this wasn't set</p> | ||||||
<p>e.g. Setting it 7 will cause an instance to say up a minimum of 7 hours before it will be considered for shutdown</p> | ||||||
</div> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure why this got deleted in my commit. let me submit a new commit