Skip to content

Commit

Permalink
Merge pull request #24 from oleg-nenashev/JENKINS-50318
Browse files Browse the repository at this point in the history 
[JENKINS-50318] - Stop caching cache objects on the disk
  • Loading branch information
@schmutze
schmutze committed May 13, 2018
2 parents 9ac8cc3 + 85ea7bc commit 08347b9
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 38 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
@@ -1,3 +1,3 @@
#!groovy

buildPlugin(jenkinsVersions: [null, '2.60.1'], failFast: false)
buildPlugin(jenkinsVersions: [null, '2.60.1', '2.107.1'], failFast: false)
5 changes: 3 additions & 2 deletions pom.xml
View file
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>2.32</version>
<version>3.6</version>
<relativePath />
</parent>

Expand All @@ -16,11 +16,12 @@

<properties>
<jenkins.version>1.625.3</jenkins.version>
<java.level>7</java.level>
</properties>

<name>EC2 Fleet Jenkins Plugin</name>
<description>Support EC2 SpotFleet for Jenkins</description>
<url>https://wiki.jenkins-ci.org/display/JENKINS/Amazon+EC2+Fleet+Plugin</url>
<url>https://wiki.jenkins.io/display/JENKINS/Amazon+EC2+Fleet+Plugin</url>
<licenses>
<license>
<name>MIT License</name>
Expand Down
77 changes: 42 additions & 35 deletions src/main/java/com/amazon/jenkins/ec2fleet/EC2FleetCloud.java
View file
Expand Up @@ -17,17 +17,12 @@
import com.amazonaws.services.ec2.model.TerminateInstancesResult;
import com.cloudbees.jenkins.plugins.awscredentials.AWSCredentialsHelper;
import com.cloudbees.jenkins.plugins.awscredentials.AmazonWebServicesCredentials;
import com.cloudbees.plugins.credentials.CredentialsMatchers;
import com.cloudbees.plugins.credentials.CredentialsProvider;
import com.cloudbees.plugins.credentials.common.StandardListBoxModel;
import com.google.common.util.concurrent.SettableFuture;
import hudson.Extension;
import hudson.model.Computer;
import hudson.model.Descriptor;
import hudson.model.Label;
import hudson.model.Node;
import hudson.model.TaskListener;
import hudson.security.ACL;
import hudson.slaves.Cloud;
import hudson.slaves.ComputerConnector;
import hudson.slaves.NodeProperty;
Expand Down Expand Up @@ -79,15 +74,16 @@ public class EC2FleetCloud extends Cloud
private final Integer minSize;
private final Integer maxSize;
private final Integer numExecutors;
private @Nonnull FleetStateStats status;

private final Set<NodeProvisioner.PlannedNode> plannedNodes =
new HashSet<NodeProvisioner.PlannedNode>();
// instancesSeen are all nodes known to both Jenkins and the fleet
private final Set<String> instancesSeen = new HashSet<String>();
// instancesDying are terminated nodes known to both Jenkins and the fleet,

private transient @Nonnull FleetStateStats statusCache;

private transient Set<NodeProvisioner.PlannedNode> plannedNodesCache;
// instancesSeenCache are all nodes known to both Jenkins and the fleet
private transient Set<String> instancesSeenCache;
// instancesDyingCache are terminated nodes known to both Jenkins and the fleet,
// that are waiting for termination
private final Set<String> instancesDying = new HashSet<String>();
private transient Set<String> instancesDyingCache;

private static final Logger LOGGER = Logger.getLogger(EC2FleetCloud.class.getName());

Expand Down Expand Up @@ -115,6 +111,7 @@ public EC2FleetCloud(final String credentialsId,
final Integer maxSize,
final Integer numExecutors) {
super(FLEET_CLOUD_ID);
initCaches();
this.credentialsId = credentialsId;
this.region = region;
this.fleet = fleet;
Expand All @@ -126,8 +123,18 @@ public EC2FleetCloud(final String credentialsId,
this.minSize = minSize;
this.maxSize = maxSize;
this.numExecutors = numExecutors;
}

private Object readResolve() {
initCaches();
return this;
}

this.status = new FleetStateStats(fleet, 0, "Initializing", Collections.<String>emptySet(), labelString);
private void initCaches() {
statusCache = new FleetStateStats(fleet, 0, "Initializing", Collections.<String>emptySet(), labelString);
plannedNodesCache = new HashSet<NodeProvisioner.PlannedNode>();
instancesSeenCache = new HashSet<String>();
instancesDyingCache = new HashSet<String>();
}

public String getCredentialsId() {
Expand Down Expand Up @@ -178,8 +185,8 @@ public String getJvmSettings() {
return "";
}

public @Nonnull FleetStateStats getStatus() {
return status;
public @Nonnull FleetStateStats getStatusCache() {
return statusCache;
}

public static void log(final Logger logger, final Level level,
Expand Down Expand Up @@ -236,7 +243,7 @@ public static void log(final Logger logger, final Level level,
final NodeProvisioner.PlannedNode plannedNode=
new NodeProvisioner.PlannedNode("FleetNode-"+f, futureNode, this.numExecutors);
resultList.add(plannedNode);
this.plannedNodes.add(plannedNode);
this.plannedNodesCache.add(plannedNode);
}
return resultList;
}
Expand All @@ -261,38 +268,38 @@ private synchronized void removeNode(String instanceId) {
public synchronized FleetStateStats updateStatus() {
final AmazonEC2 ec2=connect(credentialsId, region);
final FleetStateStats curStatus=FleetStateStats.readClusterState(ec2, getFleet(), this.labelString);
status = curStatus;
statusCache = curStatus;
LOGGER.log(Level.FINE, "Fleet Update Status called");
LOGGER.log(Level.FINE, "# of nodes:" + Jenkins.getInstance().getNodes().size());

// Check the nodes to see if we have some new ones
final Set<String> newInstances = new HashSet<String>(curStatus.getInstances());
instancesSeen.clear();
instancesSeenCache.clear();
LOGGER.log(Level.FINE, "Fleet (" + getLabelString() + ") contains instances [" + join(", ", newInstances) + "]");
LOGGER.log(Level.FINE, "Jenkins contains dying instances [" + join(", ", instancesDying) + "]");
LOGGER.log(Level.FINE, "Jenkins contains dying instances [" + join(", ", instancesDyingCache) + "]");
for(final Node node : Jenkins.getInstance().getNodes()) {
if (newInstances.contains(node.getNodeName())) {
// instancesSeen should only have the intersection of nodes
// instancesSeenCache should only have the intersection of nodes
// known by Jenkins and by the fleet.
instancesSeen.add(node.getNodeName());
} else if (instancesDying.contains(node.getNodeName())) {
instancesSeenCache.add(node.getNodeName());
} else if (instancesDyingCache.contains(node.getNodeName())) {
LOGGER.log(Level.INFO, "Fleet (" + getLabelString() + ") no longer has the instance " + node.getNodeName() + ", removing from Jenkins.");
removeNode(node.getNodeName());
instancesDying.remove(node.getNodeName());
instancesSeen.remove(node.getNodeName());
instancesDyingCache.remove(node.getNodeName());
instancesSeenCache.remove(node.getNodeName());
}
}

// We should only keep dying instances that are still visible to both
// Jenkins and the fleet.
instancesDying.retainAll(instancesSeen);
instancesDyingCache.retainAll(instancesSeenCache);

// New instances are only ones that Jenkins hasn't seen
newInstances.removeAll(instancesSeen);
newInstances.removeAll(instancesSeenCache);

// Update the label for all seen instances, unless they're dying
for(final String instId : instancesSeen) {
if (instancesDying.contains(instId))
for(final String instId : instancesSeenCache) {
if (instancesDyingCache.contains(instId))
continue;

Node node = Jenkins.getInstance().getNode(instId);
Expand Down Expand Up @@ -362,12 +369,12 @@ private void addNewSlave(final AmazonEC2 ec2, final String instanceId) throws Ex
}

//A new node, wheee!
instancesSeen.add(instanceId);
if (!plannedNodes.isEmpty())
instancesSeenCache.add(instanceId);
if (!plannedNodesCache.isEmpty())
{
//If we're waiting for a new node - mark it as ready
final NodeProvisioner.PlannedNode curNode=plannedNodes.iterator().next();
plannedNodes.remove(curNode);
final NodeProvisioner.PlannedNode curNode= plannedNodesCache.iterator().next();
plannedNodesCache.remove(curNode);
((SettableFuture<Node>)curNode.future).set(slave);
}
}
Expand All @@ -377,14 +384,14 @@ public synchronized boolean terminateInstance(final String instanceId) {

final FleetStateStats stats=updateStatus();

if (!instancesSeen.contains(instanceId)) {
if (!instancesSeenCache.contains(instanceId)) {
LOGGER.log(Level.INFO, "Unknown instance terminated: " + instanceId);
return false;
}

final AmazonEC2 ec2 = connect(credentialsId, region);

if (!instancesDying.contains(instanceId)) {
if (!instancesDyingCache.contains(instanceId)) {
// We can't remove instances beyond minSize
if (stats.getNumDesired() == this.getMinSize() || !"active".equals(stats.getState())) {
LOGGER.log(Level.INFO, "Not terminating " + instanceId + " because we need a minimum of " + Integer.toString(this.getMinSize()) + " instances running.");
Expand All @@ -399,7 +406,7 @@ public synchronized boolean terminateInstance(final String instanceId) {
ec2.modifySpotFleetRequest(request);

//And remove the instance
instancesDying.add(instanceId);
instancesDyingCache.add(instanceId);
}

// terminateInstances is idempotent so it can be called until it's successful
Expand Down

0 comments on commit 08347b9

Please sign in to comment.