You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2018/12/30 18:45:55 UTC
[camel] branch camel-2.21.x updated (0bb530d -> a567106)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 0bb530d CAMEL-12974: XML DSL tree parser should skip when/otherwise to parse similar like the Java DSL does
new 2f7f84e CAMEL-12969: OSGi service registry should unget services later during shutting down CamelContext which we can do in the start/stop service API instead. This reduces leaks if a service is get udring shutdown as now the lifecycle/osgi service registry is stopped as last action when camel context is shutting down.
new bc54fbe CAMEL-12969 : Map based Service Usage counting to remove memory leak (#2695)
new a567106 CAMEL-12969: Fixed CS
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/core/osgi/OsgiServiceRegistry.java | 73 +++++++++++++++-------
1 file changed, 52 insertions(+), 21 deletions(-)
[camel] 03/03: CAMEL-12969: Fixed CS
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a567106c8cc17b475767e7035114e6f343a83faf
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Dec 30 19:00:08 2018 +0100
CAMEL-12969: Fixed CS
---
.../org/apache/camel/core/osgi/OsgiServiceRegistry.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
index d8a0365..d87ea14 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
@@ -156,22 +156,22 @@ public class OsgiServiceRegistry extends LifecycleStrategySupport implements Reg
this.serviceReferenceUsageMap.clear();
}
- void drainServiceUsage(ServiceReference<?> serviceReference, AtomicLong serviceUsageCount) {
+ private void drainServiceUsage(ServiceReference<?> serviceReference, AtomicLong serviceUsageCount) {
if (serviceUsageCount != null && serviceReference != null) {
- while(serviceUsageCount.decrementAndGet() >= 0) {
+ while (serviceUsageCount.decrementAndGet() >= 0) {
this.bundleContext.ungetService(serviceReference);
}
}
}
-
- void incrementServiceUsage(ServiceReference<?> sr) {
+
+ private void incrementServiceUsage(ServiceReference<?> sr) {
AtomicLong serviceUsageCount = this.serviceReferenceUsageMap.get(sr);
if (serviceUsageCount != null) {
serviceUsageCount.incrementAndGet();
} else {
- this.serviceReferenceUsageMap.merge(sr, new AtomicLong(1),
- (existingServiceUsageCount, newServiceUsageCount)->{
- existingServiceUsageCount.getAndAdd(newServiceUsageCount.get());
+ this.serviceReferenceUsageMap.merge(sr, new AtomicLong(1),
+ (existingServiceUsageCount, newServiceUsageCount) -> {
+ existingServiceUsageCount.getAndAdd(newServiceUsageCount.get());
return existingServiceUsageCount;
});
}
[camel] 02/03: CAMEL-12969 : Map based Service Usage counting to
remove memory leak (#2695)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bc54fbe4d98421048eb35d387441653929ec0080
Author: Bob Paulin <bo...@bobpaulin.com>
AuthorDate: Sun Dec 30 11:57:36 2018 -0600
CAMEL-12969 : Map based Service Usage counting to remove memory leak (#2695)
---
.../camel/core/osgi/OsgiServiceRegistry.java | 60 ++++++++++++++++------
1 file changed, 43 insertions(+), 17 deletions(-)
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
index e0b97e8..d8a0365 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
@@ -19,9 +19,9 @@ package org.apache.camel.core.osgi;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import java.util.Queue;
import java.util.Set;
-import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
import org.apache.camel.Service;
import org.apache.camel.spi.Registry;
@@ -30,6 +30,8 @@ import org.apache.camel.util.ObjectHelper;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceEvent;
+import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,13 +39,14 @@ import org.slf4j.LoggerFactory;
/**
* The OsgiServiceRegistry support to get the service object from the bundle context
*/
-public class OsgiServiceRegistry extends LifecycleStrategySupport implements Registry, Service {
- private static final Logger LOG = LoggerFactory.getLogger(OsgiCamelContextHelper.class);
+public class OsgiServiceRegistry extends LifecycleStrategySupport implements Registry, Service, ServiceListener {
+ private static final Logger LOG = LoggerFactory.getLogger(OsgiServiceRegistry.class);
private final BundleContext bundleContext;
- private final Queue<ServiceReference<?>> serviceReferenceQueue = new ConcurrentLinkedQueue<ServiceReference<?>>();
-
+ private final Map<ServiceReference<?>, AtomicLong> serviceReferenceUsageMap = new ConcurrentHashMap<>();
+
public OsgiServiceRegistry(BundleContext bc) {
bundleContext = bc;
+ bundleContext.addServiceListener(this);
}
/**
@@ -57,7 +60,7 @@ public class OsgiServiceRegistry extends LifecycleStrategySupport implements Reg
if (refs != null && refs.length > 0) {
// just return the first one
sr = refs[0];
- serviceReferenceQueue.add(sr);
+ incrementServiceUsage(sr);
service = bundleContext.getService(sr);
}
} catch (Exception ex) {
@@ -88,9 +91,7 @@ public class OsgiServiceRegistry extends LifecycleStrategySupport implements Reg
}
}
if (sr != null) {
- // Need to keep the track of Service
- // and call ungetService when the camel context is closed
- serviceReferenceQueue.add(sr);
+ incrementServiceUsage(sr);
service = bundleContext.getService(sr);
}
return service;
@@ -105,7 +106,7 @@ public class OsgiServiceRegistry extends LifecycleStrategySupport implements Reg
for (ServiceReference<?> sr : refs) {
if (sr != null) {
Object service = bundleContext.getService(sr);
- serviceReferenceQueue.add(sr);
+ incrementServiceUsage(sr);
if (service != null) {
String name = (String)sr.getProperty("name");
if (name != null) {
@@ -151,12 +152,37 @@ public class OsgiServiceRegistry extends LifecycleStrategySupport implements Reg
public void stop() throws Exception {
// Unget the OSGi service as OSGi uses reference counting
// and we should do this as one of the last actions when stopping Camel
- ServiceReference<?> sr = serviceReferenceQueue.poll();
- while (sr != null) {
- bundleContext.ungetService(sr);
- sr = serviceReferenceQueue.poll();
+ this.serviceReferenceUsageMap.forEach(this::drainServiceUsage);
+ this.serviceReferenceUsageMap.clear();
+ }
+
+ void drainServiceUsage(ServiceReference<?> serviceReference, AtomicLong serviceUsageCount) {
+ if (serviceUsageCount != null && serviceReference != null) {
+ while(serviceUsageCount.decrementAndGet() >= 0) {
+ this.bundleContext.ungetService(serviceReference);
+ }
+ }
+ }
+
+ void incrementServiceUsage(ServiceReference<?> sr) {
+ AtomicLong serviceUsageCount = this.serviceReferenceUsageMap.get(sr);
+ if (serviceUsageCount != null) {
+ serviceUsageCount.incrementAndGet();
+ } else {
+ this.serviceReferenceUsageMap.merge(sr, new AtomicLong(1),
+ (existingServiceUsageCount, newServiceUsageCount)->{
+ existingServiceUsageCount.getAndAdd(newServiceUsageCount.get());
+ return existingServiceUsageCount;
+ });
+ }
+ }
+
+ @Override
+ public void serviceChanged(ServiceEvent event) {
+ if (event.getType() == ServiceEvent.UNREGISTERING) {
+ ServiceReference<?> serviceReference = event.getServiceReference();
+ AtomicLong serviceUsageCount = this.serviceReferenceUsageMap.remove(serviceReference);
+ drainServiceUsage(serviceReference, serviceUsageCount);
}
- // Clean up the OSGi Service Cache
- serviceReferenceQueue.clear();
}
}
[camel] 01/03: CAMEL-12969: OSGi service registry should unget
services later during shutting down CamelContext which we can do in the
start/stop service API instead. This reduces leaks if a service is get
udring shutdown as now the lifecycle/osgi service registry is stopped as
last action when camel context is shutting down.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2f7f84e5fb49abe2aa9246b39b7d307d375c516c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 11 15:20:56 2018 +0100
CAMEL-12969: OSGi service registry should unget services later during shutting down CamelContext which we can do in the start/stop service API instead. This reduces leaks if a service is get udring shutdown as now the lifecycle/osgi service registry is stopped as last action when camel context is shutting down.
---
.../org/apache/camel/core/osgi/OsgiServiceRegistry.java | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
index 337061b..e0b97e8 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiServiceRegistry.java
@@ -23,7 +23,7 @@ import java.util.Queue;
import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;
-import org.apache.camel.CamelContext;
+import org.apache.camel.Service;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.LifecycleStrategySupport;
import org.apache.camel.util.ObjectHelper;
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
/**
* The OsgiServiceRegistry support to get the service object from the bundle context
*/
-public class OsgiServiceRegistry extends LifecycleStrategySupport implements Registry {
+public class OsgiServiceRegistry extends LifecycleStrategySupport implements Registry, Service {
private static final Logger LOG = LoggerFactory.getLogger(OsgiCamelContextHelper.class);
private final BundleContext bundleContext;
private final Queue<ServiceReference<?>> serviceReferenceQueue = new ConcurrentLinkedQueue<ServiceReference<?>>();
@@ -51,7 +51,7 @@ public class OsgiServiceRegistry extends LifecycleStrategySupport implements Reg
*/
public <T> T lookupByNameAndType(String name, Class<T> type) {
Object service = null;
- ServiceReference<?> sr = null;
+ ServiceReference<?> sr;
try {
ServiceReference<?>[] refs = bundleContext.getServiceReferences(type.getName(), "(name=" + name + ")");
if (refs != null && refs.length > 0) {
@@ -143,8 +143,14 @@ public class OsgiServiceRegistry extends LifecycleStrategySupport implements Reg
}
@Override
- public void onContextStop(CamelContext context) {
- // Unget the OSGi service
+ public void start() throws Exception {
+ // noop
+ }
+
+ @Override
+ public void stop() throws Exception {
+ // Unget the OSGi service as OSGi uses reference counting
+ // and we should do this as one of the last actions when stopping Camel
ServiceReference<?> sr = serviceReferenceQueue.poll();
while (sr != null) {
bundleContext.ungetService(sr);
@@ -153,5 +159,4 @@ public class OsgiServiceRegistry extends LifecycleStrategySupport implements Reg
// Clean up the OSGi Service Cache
serviceReferenceQueue.clear();
}
-
}