Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 54764200C48 for ; Thu, 16 Mar 2017 13:20:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 536D1160B78; Thu, 16 Mar 2017 12:20:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 813BA160B8E for ; Thu, 16 Mar 2017 13:20:18 +0100 (CET) Received: (qmail 34400 invoked by uid 500); 16 Mar 2017 12:20:17 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 34199 invoked by uid 99); 16 Mar 2017 12:20:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Mar 2017 12:20:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6DD13DFF30; Thu, 16 Mar 2017 12:20:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: acosentino@apache.org To: commits@camel.apache.org Date: Thu, 16 Mar 2017 12:20:18 -0000 Message-Id: In-Reply-To: <8b3496954b244f7e97522392d0838957@git.apache.org> References: <8b3496954b244f7e97522392d0838957@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] camel git commit: CAMEL-11020: Camel Kubernetes consumers do not close watchers - Namespace Consumer archived-at: Thu, 16 Mar 2017 12:20:19 -0000 CAMEL-11020: Camel Kubernetes consumers do not close watchers - Namespace Consumer Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1f92f814 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1f92f814 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1f92f814 Branch: refs/heads/camel-2.18.x Commit: 1f92f814f85f2daa9b2f811b741e280a2d16c5c9 Parents: c2add9f Author: Andrea Cosentino Authored: Thu Mar 16 11:50:56 2017 +0100 Committer: Andrea Cosentino Committed: Thu Mar 16 13:09:07 2017 +0100 ---------------------------------------------------------------------- .../consumer/KubernetesNamespacesConsumer.java | 23 ++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1f92f814/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumer.java index 9e09105..51d5abe 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/consumer/KubernetesNamespacesConsumer.java @@ -22,6 +22,7 @@ import io.fabric8.kubernetes.api.model.DoneableNamespace; import io.fabric8.kubernetes.api.model.Namespace; import io.fabric8.kubernetes.api.model.NamespaceList; import io.fabric8.kubernetes.client.KubernetesClientException; +import io.fabric8.kubernetes.client.Watch; import io.fabric8.kubernetes.client.Watcher; import io.fabric8.kubernetes.client.dsl.ClientNonNamespaceOperation; import io.fabric8.kubernetes.client.dsl.ClientResource; @@ -42,6 +43,7 @@ public class KubernetesNamespacesConsumer extends DefaultConsumer { private final Processor processor; private ExecutorService executor; + private NamespacesConsumerTask nsWatcher; public KubernetesNamespacesConsumer(KubernetesEndpoint endpoint, Processor processor) { super(endpoint, processor); @@ -58,7 +60,8 @@ public class KubernetesNamespacesConsumer extends DefaultConsumer { super.doStart(); executor = getEndpoint().createExecutor(); - executor.submit(new NamespacesConsumerTask()); + nsWatcher = new NamespacesConsumerTask(); + executor.submit(nsWatcher); } @Override @@ -68,8 +71,14 @@ public class KubernetesNamespacesConsumer extends DefaultConsumer { LOG.debug("Stopping Kubernetes Namespace Consumer"); if (executor != null) { if (getEndpoint() != null && getEndpoint().getCamelContext() != null) { + if (nsWatcher != null) { + nsWatcher.getWatch().close(); + } getEndpoint().getCamelContext().getExecutorServiceManager().shutdownNow(executor); } else { + if (nsWatcher != null) { + nsWatcher.getWatch().close(); + } executor.shutdownNow(); } } @@ -77,6 +86,8 @@ public class KubernetesNamespacesConsumer extends DefaultConsumer { } class NamespacesConsumerTask implements Runnable { + + private Watch watch; @Override public void run() { @@ -84,7 +95,7 @@ public class KubernetesNamespacesConsumer extends DefaultConsumer { if (ObjectHelper.isNotEmpty(getEndpoint().getKubernetesConfiguration().getNamespace())) { w.withName(getEndpoint().getKubernetesConfiguration().getNamespace()); } - w.watch(new Watcher() { + watch = w.watch(new Watcher() { @Override public void eventReceived(io.fabric8.kubernetes.client.Watcher.Action action, @@ -108,6 +119,14 @@ public class KubernetesNamespacesConsumer extends DefaultConsumer { } } }); + } + + public Watch getWatch() { + return watch; + } + + public void setWatch(Watch watch) { + this.watch = watch; } } }