You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/11/20 09:16:03 UTC
[2/3] camel git commit: CAMEL-8053 Fixed the issue of Memory leak
when adding/removing a lot of routes
CAMEL-8053 Fixed the issue of Memory leak when adding/removing a lot of routes
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cac72b14
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cac72b14
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cac72b14
Branch: refs/heads/master
Commit: cac72b147aec6552724f8b03e634d5e43cfdefa7
Parents: e7b19da
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Nov 20 14:02:30 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Nov 20 16:14:27 2014 +0800
----------------------------------------------------------------------
.../camel/builder/ErrorHandlerBuilder.java | 1 +
.../camel/builder/ErrorHandlerBuilderRef.java | 12 +++
.../builder/ErrorHandlerBuilderSupport.java | 25 ++++++
.../apache/camel/impl/DefaultCamelContext.java | 7 +-
.../builder/ErrorHandlerBuilderRefTest.java | 87 ++++++++++++++++++++
5 files changed, 131 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cac72b14/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
index 303feb1..3c5a3f1 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilder.java
@@ -90,4 +90,5 @@ public interface ErrorHandlerBuilder extends ErrorHandlerFactory {
* @return a clone of this {@link ErrorHandlerBuilder}
*/
ErrorHandlerBuilder cloneBuilder();
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/cac72b14/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
index 0cf9d57..4d06b7f 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
@@ -50,6 +50,18 @@ public class ErrorHandlerBuilderRef extends ErrorHandlerBuilderSupport {
}
super.addErrorHandlers(routeContext, exception);
}
+
+ @Override
+ public boolean removeOnExceptionList(String id) {
+ for (RouteContext routeContext : handlers.keySet()) {
+ if (getRouteId(routeContext).equals(id)) {
+ handlers.remove(routeContext);
+ break;
+ }
+ }
+ return super.removeOnExceptionList(id);
+ }
+
public Processor createErrorHandler(RouteContext routeContext, Processor processor) throws Exception {
ErrorHandlerBuilder handler = handlers.get(routeContext);
http://git-wip-us.apache.org/repos/asf/camel/blob/cac72b14/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
index 747a6dd..365ebc0 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderSupport.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.camel.CamelContext;
import org.apache.camel.model.OnExceptionDefinition;
import org.apache.camel.processor.ErrorHandler;
import org.apache.camel.processor.ErrorHandlerSupport;
@@ -94,4 +95,28 @@ public abstract class ErrorHandlerBuilderSupport implements ErrorHandlerBuilder
ObjectHelper.notNull(exceptionPolicyStrategy, "ExceptionPolicyStrategy");
this.exceptionPolicyStrategy = exceptionPolicyStrategy;
}
+
+ /**
+ * Remove the OnExceptionList by look up the route id from the ErrorHandlerBuilder internal map
+ * @param id the route id
+ * @return true if the route context is found and removed
+ */
+ public boolean removeOnExceptionList(String id) {
+ for (RouteContext routeContext : onExceptions.keySet()) {
+ if (getRouteId(routeContext).equals(id)) {
+ onExceptions.remove(routeContext);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ protected String getRouteId(RouteContext routeContext) {
+ CamelContext context = routeContext.getCamelContext();
+ if (context != null) {
+ return routeContext.getRoute().idOrCreate(context.getNodeIdFactory());
+ } else {
+ return routeContext.getRoute().getId();
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/cac72b14/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index deba649..bd4488c 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -71,6 +71,7 @@ import org.apache.camel.SuspendableService;
import org.apache.camel.TypeConverter;
import org.apache.camel.VetoCamelContextStartException;
import org.apache.camel.builder.ErrorHandlerBuilder;
+import org.apache.camel.builder.ErrorHandlerBuilderSupport;
import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.impl.converter.BaseTypeConverterRegistry;
import org.apache.camel.impl.converter.DefaultTypeConverter;
@@ -147,7 +148,6 @@ import org.apache.camel.util.TimeUtils;
import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import static org.apache.camel.util.StringQuoteHelper.doubleQuote;
/**
@@ -928,6 +928,11 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
}
public synchronized boolean removeRoute(String routeId) throws Exception {
+ // remove the route from ErrorHandlerBuilder if possible
+ if (getErrorHandlerBuilder() instanceof ErrorHandlerBuilderSupport) {
+ ErrorHandlerBuilderSupport builder = (ErrorHandlerBuilderSupport)getErrorHandlerBuilder();
+ builder.removeOnExceptionList(routeId);
+ }
RouteService routeService = routeServices.get(routeId);
if (routeService != null) {
if (getRouteStatus(routeId).isStopped()) {
http://git-wip-us.apache.org/repos/asf/camel/blob/cac72b14/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerBuilderRefTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerBuilderRefTest.java b/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerBuilderRefTest.java
new file mode 100644
index 0000000..047242c
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerBuilderRefTest.java
@@ -0,0 +1,87 @@
+/**
+ * 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.builder;
+
+import java.lang.reflect.Field;
+import java.util.Map;
+import java.util.UUID;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.impl.JndiRegistry;
+
+public class ErrorHandlerBuilderRefTest extends ContextTestSupport {
+ ErrorHandlerBuilderRef errorHandlerBuilderRef = new ErrorHandlerBuilderRef("ref");
+
+ @Override
+ public boolean isUseRouteBuilder() {
+ return true;
+ }
+
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry registry = super.createRegistry();
+ registry.bind("ref", new DefaultErrorHandlerBuilder());
+ return registry;
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+ context.setErrorHandlerBuilder(errorHandlerBuilderRef);
+ return context;
+ }
+
+ public void testErrorHandlerBuilderRef() throws Exception {
+ String uuid = UUID.randomUUID().toString();
+ context.addRoutes(new TempRouteBuilder(uuid));
+ checkObjectSize(2);
+ context.stopRoute(uuid);
+ context.removeRoute(uuid);
+ checkObjectSize(1);
+ }
+
+ private void checkObjectSize(int size) throws Exception {
+ assertEquals("Get a wrong size of Route", size, context.getRoutes().size());
+ Field field = ErrorHandlerBuilderRef.class.getDeclaredField("handlers");
+ field.setAccessible(true);
+ assertEquals("Get a wrong size of ErrorHandler", size, ((Map<?, ?>) field.get(errorHandlerBuilderRef)).size());
+ }
+
+ private static class TempRouteBuilder extends RouteBuilder {
+
+ final String routeId;
+
+ public TempRouteBuilder(String routeId) {
+ this.routeId = routeId;
+ }
+
+ @Override
+ public void configure() throws Exception {
+ from("direct:foo").routeId(routeId).to("mock:foo");
+ }
+ }
+
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() {
+ from("direct:start").to("mock:result");
+ }
+ };
+ }
+
+}