Adding basic retention #91

jeffersongirao · 2016-11-14T18:48:31Z

The idea is to re-use slaves after successful builds, the slave is terminated after being idle for the time defined in idleMinutes. That is useful for builds that rely heavily on cached data for "speed".

carlossg · 2016-11-20T11:08:54Z

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java


 /**
 * Kubernetes cloud provider.
- * 
+ *


it helps reviewing PRs if there are no spurious changes in imports or whitespace

My bad, I reverted such changes.

carlossg · 2016-11-20T11:33:22Z

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesSlave.java

@@ -44,9 +38,11 @@

    private transient final KubernetesCloud cloud;

-    @DataBoundConstructor
+    @Deprecated


I think there is no need to deprecate it
It should call the other constructor this(...) to avoid duplication

carlossg · 2016-11-20T11:42:42Z

src/main/resources/org/csanchez/jenkins/plugins/kubernetes/PodTemplate/config.jelly

@@ -27,6 +27,10 @@
    <f:textbox/>
  </f:entry>

+  <f:entry field="retainedAfterTask" title="${%Retain slave after task}">


instead of having a boolean, I think it's better to have idleMinutes here, like the docker plugin, so it can be set per template for how long it should be kept

jeffersongirao · 2016-11-21T19:10:47Z

Thanks for the feedback, I've made the suggested changes. Cheers!

carlossg · 2016-11-21T19:18:24Z

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesSlave.java

+                           RetentionStrategy rs)
+            throws Descriptor.FormException, IOException {
+
+        this(template, nodeDescription, cloud, labelStr);


I think you'd better do it the other way around, call this(template, nodeDescription, cloud, labelStr, rs); in the first constructor, call super in the second one

carlossg · 2016-11-21T19:19:56Z

src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplate.java

@@ -49,6 +49,8 @@

    private int instanceCap = Integer.MAX_VALUE;

+    private int idleMinutes = Integer.MIN_VALUE;


why not just use Integer and set it to null?

Just afraid of NullPointerException in general. I will change it.

carlossg · 2016-11-21T19:21:18Z

src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplate.java

+
+    @DataBoundSetter
+    public void setIdleMinutesStr(String idleMinutes) {
+        if ("".equals(idleMinutes)) {


you'd want to use StringUtils.isBlank() not just the empty string

Is it ok to introduce a dependency here? I was just trying to be consistent with what is implemented for setInstanceCapStr.

carlossg · 2016-11-21T19:23:58Z

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java

+                if (t.getIdleMinutes() == Integer.MIN_VALUE) {
+                    retentionStrategy = new OnceRetentionStrategy(cloud.getRetentionTimeout());
+                } else {
+                    retentionStrategy = new CloudRetentionStrategy(cloud.getRetentionTimeout());


shouldn't be t.getIdleMinutes() to use the idle time for the template ?

You are right, fixing it.

jeffersongirao · 2016-11-21T20:45:55Z

I did changes, please let me know if you prefer me to squash the commits in a single one. Cheers!

carlossg

Just one last comment, and then it needs rebase

carlossg · 2016-11-29T15:38:54Z

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesSlave.java

+
+    @Deprecated
+    public KubernetesSlave(PodTemplate template, String nodeDescription, KubernetesCloud cloud, Label label)
+            throws Descriptor.FormException, IOException {


can you just call

this(template, nodeDescription, cloud, label, new OnceRetentionStrategy(cloud.getRetentionTimeout()))

to avoid duplicated code

jeffersongirao · 2016-11-30T08:23:51Z

Fixed and rebased. Thanks!

carlossg · 2016-11-30T08:48:35Z

thanks!

JeanMertz · 2016-12-02T15:32:41Z

I'm not sure if this is the PR that caused our issues, but it's closely related, so I'll put this here:

We use different docker images for each of our projects running on Jenkins using the kubernetes-plugin.

I've noticed recently that a lot of times a job of project A might end up on a pod/container of project B.

Because each pod/container setup is highly coupled to the different projects, a lot of tools are missing for project A to run inside a pod of project B, and thus the run fails.

We haven't set the idleMinutes value, so it should default to 0, and thus OnceRetentionStrategy , but that doesn't seem to be the case.

Something else that I noticed: since this PR(?) any custom pod template that we define in a Jenkinsfile gets automatically added to the list of global list of "Kubernetes Pod Template" configs in the global configuration page of Jenkins.

This means that after a while, we end up with thousands of templates on that page, grinding that page to a halt. Possibly, this is the cause of the shared pod templates we are seeing?

JeanMertz · 2016-12-02T15:46:37Z

If I do a "reload from disk", the extra templates disappear from the global configuration (leaving only those that we actually defined in the global scope)

jeffersongirao · 2016-12-07T07:38:17Z

Hello @JeanMertz, I tried to reproduce your issue but I could not. Could you please, give more details about the version of Jenkins you are trying it out and example of the Jenkinsfile? Thanks!

mariachugunova · 2019-08-20T20:15:45Z

Hi! Is there a way to keep slave forever?

carlossg requested changes Nov 20, 2016

View reviewed changes

carlossg reviewed Nov 21, 2016

View reviewed changes

carlossg reviewed Nov 29, 2016

View reviewed changes

jeffersongirao added 8 commits November 30, 2016 09:21

Adding retention for idle slaves

88ed9c4

Using the idleTimeout setting properly

04d3ab9

Relying on null value for int

0e0fc08

Delegating to the proper constructor

a00d431

Fixing setter

9a70662

Check for blank with StringUtils

7bc63ae

Fix check for non defined idleMinutes

3d749c7

Removing duplication

f3e1e07

carlossg merged commit 78b1c25 into jenkinsci:master Nov 30, 2016

jglick mentioned this pull request Jun 14, 2021

Fix pod template ID inconsistency over master reboots #988

Open

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding basic retention #91

Adding basic retention #91

jeffersongirao commented Nov 14, 2016 •

edited

Loading

carlossg Nov 20, 2016

jeffersongirao Nov 21, 2016

carlossg Nov 20, 2016

jeffersongirao Nov 21, 2016

carlossg Nov 20, 2016

jeffersongirao Nov 21, 2016

jeffersongirao commented Nov 21, 2016

carlossg Nov 21, 2016

carlossg Nov 21, 2016

jeffersongirao Nov 21, 2016

carlossg Nov 21, 2016

jeffersongirao Nov 21, 2016

carlossg Nov 21, 2016

jeffersongirao Nov 21, 2016

jeffersongirao commented Nov 21, 2016 •

edited

Loading

carlossg left a comment

carlossg Nov 29, 2016

jeffersongirao commented Nov 30, 2016

carlossg commented Nov 30, 2016

JeanMertz commented Dec 2, 2016

JeanMertz commented Dec 2, 2016

jeffersongirao commented Dec 7, 2016

mariachugunova commented Aug 20, 2019

		@@ -49,6 +49,8 @@

		private int instanceCap = Integer.MAX_VALUE;

		private int idleMinutes = Integer.MIN_VALUE;

Adding basic retention #91

Adding basic retention #91

Conversation

jeffersongirao commented Nov 14, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jeffersongirao commented Nov 21, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jeffersongirao commented Nov 21, 2016 • edited Loading

carlossg left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jeffersongirao commented Nov 30, 2016

carlossg commented Nov 30, 2016

JeanMertz commented Dec 2, 2016

JeanMertz commented Dec 2, 2016

jeffersongirao commented Dec 7, 2016

mariachugunova commented Aug 20, 2019

jeffersongirao commented Nov 14, 2016 •

edited

Loading

jeffersongirao commented Nov 21, 2016 •

edited

Loading