From 6e06139b41537f71cc1a0625c31e62cd48c45a5e Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Thu, 30 Dec 2021 15:51:17 +0100 Subject: [PATCH] Adapt --- .../kubernetes/KubernetesClientProvider.java | 41 ------------------- .../pipeline/ContainerExecDecorator.java | 2 +- .../kubernetes/pipeline/SecretsMasker.java | 3 -- .../pipeline/ContainerExecDecoratorTest.java | 11 ----- 4 files changed, 1 insertion(+), 56 deletions(-) diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesClientProvider.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesClientProvider.java index 259aa0ee60..1533ece474 100644 --- a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesClientProvider.java +++ b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesClientProvider.java @@ -10,10 +10,6 @@ import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import hudson.model.PeriodicWork; -import io.fabric8.kubernetes.client.HttpClientAware; -import okhttp3.Dispatcher; -import okhttp3.OkHttpClient; import org.jenkinsci.plugins.kubernetes.auth.KubernetesAuthException; import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; @@ -92,17 +88,6 @@ public int getValidity() { } } - private static volatile int runningCallsCount; - private static volatile int queuedCallsCount; - - public static int getRunningCallsCount() { - return runningCallsCount; - } - - public static int getQueuedCallsCount() { - return queuedCallsCount; - } - @Restricted(NoExternalUse.class) // testing only public static void invalidate(String displayName) { clients.invalidate(displayName); @@ -131,30 +116,4 @@ public void onChange(Saveable o, XmlFile file) { super.onChange(o, file); } } - - @Extension - public static class UpdateConnectionCount extends PeriodicWork { - - @Override - public long getRecurrencePeriod() { - return TimeUnit.SECONDS.toMillis(5); - } - - @Override - protected void doRun() { - int runningCallsCount = 0; - int queuedCallsCount = 0; - for (Client client : KubernetesClientProvider.clients.asMap().values()) { - KubernetesClient kClient = client.getClient(); - if (kClient instanceof HttpClientAware) { - OkHttpClient httpClient = ((HttpClientAware) kClient).getHttpClient(); - Dispatcher dispatcher = httpClient.dispatcher(); - runningCallsCount += dispatcher.runningCallsCount(); - queuedCallsCount += dispatcher.queuedCallsCount(); - } - } - KubernetesClientProvider.runningCallsCount = runningCallsCount; - KubernetesClientProvider.queuedCallsCount = queuedCallsCount; - } - } } diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecorator.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecorator.java index 667888821c..e22dd9d853 100755 --- a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecorator.java +++ b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecorator.java @@ -389,7 +389,7 @@ private Proc doLaunch(boolean quiet, String[] cmdEnvs, OutputStream outputForCal .writingOutput(stream).writingError(stream).writingErrorChannel(error) .usingListener(new ExecListener() { @Override - public void onOpen(Response response) { + public void onOpen() { alive.set(true); started.countDown(); startAlive.set(System.nanoTime()); diff --git a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/SecretsMasker.java b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/SecretsMasker.java index 4fec4575a3..60f51458fd 100644 --- a/src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/SecretsMasker.java +++ b/src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/SecretsMasker.java @@ -157,9 +157,6 @@ protected TaskListenerDecorator get(DelegatedContext context) throws IOException ExecWatch exec = slave.getKubernetesCloud().connect().pods().inNamespace(slave.getNamespace()).withName(slave.getPodName()).inContainer(containerName) .writingOutput(baos).writingError(errs).writingErrorChannel(errs) .usingListener(new ExecListener() { - @Override - public void onOpen(Response response) { - } @Override public void onFailure(Throwable t, Response response) { semaphore.release(); diff --git a/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecoratorTest.java b/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecoratorTest.java index a8085f63b3..67220145f7 100644 --- a/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecoratorTest.java +++ b/src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecoratorTest.java @@ -50,7 +50,6 @@ import hudson.EnvVars; import hudson.model.Computer; -import hudson.model.TaskListener; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.Watch; import org.apache.commons.io.output.TeeOutputStream; @@ -84,7 +83,6 @@ import io.fabric8.kubernetes.api.model.PodBuilder; import io.fabric8.kubernetes.client.HttpClientAware; import io.fabric8.kubernetes.client.KubernetesClient; -import okhttp3.OkHttpClient; import org.junit.Ignore; import org.jvnet.hudson.test.JenkinsRule; @@ -353,19 +351,12 @@ public void testContainerDoesNotExist() throws Exception { @Issue("JENKINS-55392") public void testRejectedExecutionException() throws Exception { assertTrue(client instanceof HttpClientAware); - OkHttpClient httpClient = ((HttpClientAware) client).getHttpClient(); - System.out.println("Max requests: " + httpClient.dispatcher().getMaxRequests() + "/" - + httpClient.dispatcher().getMaxRequestsPerHost()); - System.out.println("Connection count: " + httpClient.connectionPool().connectionCount() + " - " - + httpClient.connectionPool().idleConnectionCount()); List threads = new ArrayList<>(); final AtomicInteger errors = new AtomicInteger(0); for (int i = 0; i < 10; i++) { final String name = "Thread " + i; Thread t = new Thread(() -> { try { - System.out.println(name + " Connection count: " + httpClient.connectionPool().connectionCount() - + " - " + httpClient.connectionPool().idleConnectionCount()); ProcReturn r = execCommand(false, false, "echo", "test"); } catch (Exception e) { errors.incrementAndGet(); @@ -387,8 +378,6 @@ public void testRejectedExecutionException() throws Exception { throw new RuntimeException(e); } }); - System.out.println("Connection count: " + httpClient.connectionPool().connectionCount() + " - " - + httpClient.connectionPool().idleConnectionCount()); assertEquals("Errors in threads", 0, errors.get()); }