camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: CAMEL-8146: scheduled poll consumers may leak threads when restarting routes.
Date Thu, 18 Dec 2014 12:21:25 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x 89ce39e84 -> 749280b94


CAMEL-8146: scheduled poll consumers may leak threads when restarting routes.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/749280b9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/749280b9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/749280b9

Branch: refs/heads/camel-2.14.x
Commit: 749280b94a6f3d977e1bf41d3775b62e21f5b1e0
Parents: 89ce39e
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Thu Dec 18 11:47:11 2014 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Thu Dec 18 13:21:16 2014 +0100

----------------------------------------------------------------------
 .../DefaultScheduledPollConsumerScheduler.java  |  6 +-
 .../camel/impl/ScheduledPollConsumer.java       |  3 +-
 .../FileConsumerRestartNotLeakThreadTest.java   | 65 ++++++++++++++++++++
 3 files changed, 69 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/749280b9/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumerScheduler.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumerScheduler.java
b/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumerScheduler.java
index c132cad..729ee75 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumerScheduler.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultScheduledPollConsumerScheduler.java
@@ -156,17 +156,15 @@ public class DefaultScheduledPollConsumerScheduler extends org.apache.camel.supp
     protected void doStop() throws Exception {
         if (future != null) {
             LOG.debug("This consumer is stopping, so cancelling scheduled task: " + future);
-            future.cancel(false);
+            future.cancel(true);
             future = null;
         }
-    }
 
-    @Override
-    protected void doShutdown() throws Exception {
         if (shutdownExecutor && scheduledExecutorService != null) {
             getCamelContext().getExecutorServiceManager().shutdownNow(scheduledExecutorService);
             scheduledExecutorService = null;
             future = null;
         }
     }
+
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/749280b9/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
index 5d080e2..e300d49 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
@@ -514,7 +514,8 @@ public abstract class ScheduledPollConsumer extends DefaultConsumer implements
R
 
     @Override
     protected void doStop() throws Exception {
-        ServiceHelper.stopService(scheduler);
+        scheduler.unscheduleTask();
+        ServiceHelper.stopAndShutdownServices(scheduler);
 
         // clear counters
         backoffCounter = 0;

http://git-wip-us.apache.org/repos/asf/camel/blob/749280b9/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerRestartNotLeakThreadTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerRestartNotLeakThreadTest.java
b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerRestartNotLeakThreadTest.java
new file mode 100644
index 0000000..aa8e5cb
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerRestartNotLeakThreadTest.java
@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.file;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+
+public class FileConsumerRestartNotLeakThreadTest extends ContextTestSupport {
+
+    @Override
+    protected void setUp() throws Exception {
+        deleteDirectory("target/leak");
+        super.setUp();
+    }
+
+    public void testLeak() throws Exception {
+        int before = Thread.activeCount();
+
+        getMockEndpoint("mock:foo").expectedMessageCount(1);
+        template.sendBodyAndHeader("file:target/leak", "Hello World", Exchange.FILE_NAME,
"hello.txt");
+        assertMockEndpointsSatisfied();
+
+        for (int i = 0; i < 50; i++) {
+            context.stopRoute("foo");
+            context.startRoute("foo");
+        }
+
+        resetMocks();
+
+        getMockEndpoint("mock:foo").expectedMessageCount(1);
+        template.sendBodyAndHeader("file:target/leak", "Bye World", Exchange.FILE_NAME, "bye.txt");
+        assertMockEndpointsSatisfied();
+
+        int active = Thread.activeCount() - before;
+        log.info("Active threads after restarts: {}", active);
+
+        assertTrue("There should not be so many active threads, was " + active, active <
10);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("file:target/leak").routeId("foo")
+                    .to("mock:foo");
+            }
+        };
+    }
+}


Mime
View raw message