-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Add thread pool to verify pod deletion. #1227
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
56 changes: 56 additions & 0 deletions
56
src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesNodeDeletedTask.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
package org.csanchez.jenkins.plugins.kubernetes; | ||
|
||
import java.util.Calendar; | ||
import java.util.logging.Level; | ||
import java.util.logging.Logger; | ||
|
||
import java.io.IOException; | ||
import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthException; | ||
import io.fabric8.kubernetes.api.model.Pod; | ||
import io.fabric8.kubernetes.client.KubernetesClient; | ||
import io.fabric8.kubernetes.client.KubernetesClientException; | ||
|
||
public class KubernetesNodeDeletedTask implements Runnable { | ||
private static final Logger LOGGER = Logger.getLogger(KubernetesNodeDeletedTask.class.getName()); | ||
|
||
private KubernetesSlave node; | ||
|
||
public KubernetesNodeDeletedTask(KubernetesSlave node) { | ||
this.node = node; | ||
} | ||
|
||
public void run() { | ||
PodTemplate template = node.getTemplateOrNull(); | ||
try { | ||
KubernetesClient client = node.getKubernetesCloud().connect(); | ||
|
||
Pod pod = client.pods().inNamespace(node.getNamespace()).withName(node.getNodeName()).get(); | ||
if (pod != null) { | ||
long gracePeriod = 30; // TODO: get from pod template or somewhere else. | ||
Calendar end = Calendar.getInstance(); | ||
end.add(Calendar.SECOND, (int)Math.round(gracePeriod * 1.2)); | ||
while (Calendar.getInstance().before(end)) { | ||
if (client.pods().inNamespace(node.getNamespace()).withName(node.getNodeName()).get() == null) { | ||
LOGGER.log(Level.INFO, "Pod " + node.getNodeName() + " has been confirmed deleted."); | ||
break; | ||
} | ||
try { | ||
LOGGER.log(Level.INFO, "Pod " + node.getNodeName() + " has NOT been confirmed deleted, waiting."); | ||
Thread.sleep(3000); | ||
} catch (InterruptedException ie) { | ||
Thread.currentThread().interrupt(); | ||
break; | ||
} | ||
} | ||
} | ||
} catch (KubernetesAuthException | KubernetesClientException | IOException e) { | ||
String msg = String.format("Failed to delete pod for agent %s/%s: %s", node.getNamespace(), node.getNodeName(), e.getMessage()); | ||
LOGGER.log(Level.WARNING, msg, e); | ||
} | ||
|
||
if (template != null) { | ||
KubernetesProvisioningLimits instance = KubernetesProvisioningLimits.get(); | ||
instance.unregister(node.getKubernetesCloud(), template, node.getNumExecutors()); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
package org.csanchez.jenkins.plugins.kubernetes; | ||
|
||
import java.util.concurrent.Executors; | ||
import java.util.concurrent.ThreadPoolExecutor; | ||
import java.util.HashMap; | ||
import java.util.Map; | ||
import java.util.logging.Level; | ||
|
@@ -136,15 +138,13 @@ int getPodTemplateCount(String podTemplate) { | |
|
||
@Extension | ||
public static class NodeListenerImpl extends NodeListener { | ||
private static ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newCachedThreadPool(); | ||
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. use |
||
|
||
@Override | ||
protected void onDeleted(@NonNull Node node) { | ||
if (node instanceof KubernetesSlave) { | ||
KubernetesProvisioningLimits instance = KubernetesProvisioningLimits.get(); | ||
KubernetesSlave kubernetesNode = (KubernetesSlave) node; | ||
PodTemplate template = kubernetesNode.getTemplateOrNull(); | ||
if (template != null) { | ||
instance.unregister(kubernetesNode.getKubernetesCloud(), template, node.getNumExecutors()); | ||
} | ||
KubernetesNodeDeletedTask task = new KubernetesNodeDeletedTask((KubernetesSlave)node); | ||
executor.execute(task); | ||
} | ||
} | ||
} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Do not
sleep
in an executor task; instead, reschedule.