Skip to content
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
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
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);
Copy link
Member

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.

} 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());
}
}
}
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;
Expand Down Expand Up @@ -136,15 +138,13 @@ int getPodTemplateCount(String podTemplate) {

@Extension
public static class NodeListenerImpl extends NodeListener {
private static ThreadPoolExecutor executor = (ThreadPoolExecutor) Executors.newCachedThreadPool();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use Computer.threadPoolForRemoting


@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);
}
}
}
Expand Down