Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Issue #368] Fix Racing condition and memory leak issue in EventMesh SDK LiteConsumer and LiteProducer #369

Merged
merged 16 commits into from
May 31, 2021
Merged

[Issue #368] Fix Racing condition and memory leak issue in EventMesh SDK LiteConsumer and LiteProducer #369

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ba67c5c
Merge pull request #1 from apache/develop
jinrongluo May 10, 2021
d638ec4
[Issue #337] Fix HttpSubscriber startup issue
May 10, 2021
5ebfb54
[Issue #337] test commit
jinrongluo May 10, 2021
a3afff3
[Issue #337] revert test commit
jinrongluo May 10, 2021
50f959d
[Issue #337] Enhance Http Demo Subscriber by using ExecutorService, C…
jinrongluo May 11, 2021
7adc322
Merge remote-tracking branch 'origin/develop' into develop
jinrongluo May 11, 2021
d48ead5
[Issue #337] Enhance Http Demo Subscriber by using ExecutorService, C…
jinrongluo May 11, 2021
c9021fe
[Issue #337] Address code review comment for Subscriber Demo App
jinrongluo May 12, 2021
c6d732e
Merge branch 'apache:develop' into develop
jinrongluo May 14, 2021
c613be8
Merge branch 'apache:develop' into develop
jinrongluo May 18, 2021
66ac95e
Merge branch 'apache:develop' into develop
jinrongluo May 19, 2021
9e636c0
Merge branch 'apache:develop' into develop
jinrongluo May 26, 2021
cb2cd82
[Issue #368] Fix Racing condition and memory leak issue in EventMesh …
jinrongluo May 26, 2021
1f98932
[Issue #368] fix build issue
jinrongluo May 26, 2021
7fd5373
[Issue #368] use try with resource statement for HttpClient
jinrongluo May 27, 2021
378454e
[Issue #368] fix TLS1.1 and use TLS1.2 in HttpClient
jinrongluo May 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/AbstractLiteClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,17 @@
package org.apache.eventmesh.client.http;

import org.apache.eventmesh.client.http.conf.LiteClientConfig;
import org.apache.eventmesh.client.http.ssl.MyX509TrustManager;
import org.apache.eventmesh.client.http.util.HttpLoadBalanceUtils;
import org.apache.eventmesh.common.loadbalance.LoadBalanceSelector;
import org.apache.http.conn.ssl.DefaultHostnameVerifier;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import java.security.SecureRandom;

public abstract class AbstractLiteClient {

Expand All @@ -46,4 +53,22 @@ public LiteClientConfig getLiteClientConfig() {
public void shutdown() throws Exception {
logger.info("AbstractLiteClient shutdown");
}

public CloseableHttpClient setHttpClient() throws Exception {
jinrongluo marked this conversation as resolved.
Show resolved Hide resolved
if (!liteClientConfig.isUseTls()) {
return HttpClients.createDefault();
}
SSLContext sslContext = null;
try {
String protocol = System.getProperty("ssl.client.protocol", "TLSv1.1");
jinrongluo marked this conversation as resolved.
Show resolved Hide resolved
TrustManager[] tm = new TrustManager[]{new MyX509TrustManager()};
sslContext = SSLContext.getInstance(protocol);
sslContext.init(null, tm, new SecureRandom());
return HttpClients.custom().setSSLContext(sslContext)
.setSSLHostnameVerifier(new DefaultHostnameVerifier()).build();
} catch (Exception e) {
logger.error("Error in creating HttpClient.", e);
throw e;
}
}
}
20 changes: 15 additions & 5 deletions eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/consumer/LiteConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,13 @@ public class LiteConsumer extends AbstractLiteClient {

private ThreadPoolExecutor consumeExecutor;

private static CloseableHttpClient httpClient = HttpClients.createDefault();

protected LiteClientConfig eventMeshClientConfig;

private List<String> subscription = Lists.newArrayList();

private LiteMessageListener messageListener;

protected static final ScheduledThreadPoolExecutor scheduler = new ScheduledThreadPoolExecutor(4, new EventMeshThreadFactoryImpl("TCPClientScheduler", true));
protected final ScheduledThreadPoolExecutor scheduler = new ScheduledThreadPoolExecutor(4, new EventMeshThreadFactoryImpl("TCPClientScheduler", true));

public LiteConsumer(LiteClientConfig liteClientConfig) throws Exception {
super(liteClientConfig);
Expand Down Expand Up @@ -110,7 +108,10 @@ public void start() throws Exception {
public void shutdown() throws Exception {
logger.info("LiteConsumer shutting down");
super.shutdown();
httpClient.close();
if (consumeExecutor != null) {
consumeExecutor.shutdown();
}
scheduler.shutdown();
started.compareAndSet(true, false);
logger.info("LiteConsumer shutdown");
}
Expand All @@ -126,10 +127,13 @@ public boolean subscribe(List<String> topicList, String url) throws Exception {
long startTime = System.currentTimeMillis();
String target = selectEventMesh();
String subRes = "";
CloseableHttpClient httpClient = setHttpClient();
jinrongluo marked this conversation as resolved.
Show resolved Hide resolved
try {
subRes = HttpUtil.post(httpClient, target, subscribeParam);
} catch (Exception ex) {
throw new EventMeshException(ex);
} finally {
httpClient.close();
}

if (logger.isDebugEnabled()) {
Expand Down Expand Up @@ -211,10 +215,13 @@ public void run() {
long startTime = System.currentTimeMillis();
String target = selectEventMesh();
String res = "";
CloseableHttpClient httpClient = setHttpClient();
try {
res = HttpUtil.post(httpClient, target, requestParam);
} catch (Exception ex) {
throw new EventMeshException(ex);
} finally {
httpClient.close();
}

if (logger.isDebugEnabled()) {
Expand All @@ -234,17 +241,20 @@ public void run() {
}, EventMeshCommon.HEATBEAT, EventMeshCommon.HEATBEAT, TimeUnit.MILLISECONDS);
}

public boolean unsubscribe(List<String> topicList, String url) throws EventMeshException {
public boolean unsubscribe(List<String> topicList, String url) throws Exception {
subscription.removeAll(topicList);
RequestParam unSubscribeParam = generateUnSubscribeRequestParam(topicList, url);

long startTime = System.currentTimeMillis();
String target = selectEventMesh();
String unSubRes = "";
CloseableHttpClient httpClient = setHttpClient();
try {
unSubRes = HttpUtil.post(httpClient, target, unSubscribeParam);
} catch (Exception ex) {
throw new EventMeshException(ex);
} finally {
httpClient.close();
}

if (logger.isDebugEnabled()) {
Expand Down
33 changes: 9 additions & 24 deletions eventmesh-sdk-java/src/main/java/org/apache/eventmesh/client/http/producer/LiteProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,8 @@ public class LiteProducer extends AbstractLiteClient {

public Logger logger = LoggerFactory.getLogger(LiteProducer.class);

private static CloseableHttpClient httpClient = HttpClients.createDefault();

public LiteProducer(LiteClientConfig liteClientConfig) {
super(liteClientConfig);
if (liteClientConfig.isUseTls()) {
setHttpClient();
}
}

private AtomicBoolean started = new AtomicBoolean(Boolean.FALSE);
Expand All @@ -92,7 +87,6 @@ public void shutdown() throws Exception {
}
logger.info("LiteProducer shutting down");
super.shutdown();
httpClient.close();
started.compareAndSet(true, false);
logger.info("LiteProducer shutdown");
}
Expand Down Expand Up @@ -132,10 +126,13 @@ public boolean publish(LiteMessage message) throws Exception {
long startTime = System.currentTimeMillis();
String target = selectEventMesh();
String res = "";
CloseableHttpClient httpClient = setHttpClient();
try {
res = HttpUtil.post(httpClient, target, requestParam);
} catch (Exception ex) {
throw new EventMeshException(ex);
} finally {
httpClient.close();
}

if (logger.isDebugEnabled()) {
Expand Down Expand Up @@ -191,10 +188,13 @@ public LiteMessage request(LiteMessage message, long timeout) throws Exception {
long startTime = System.currentTimeMillis();
String target = selectEventMesh();
String res = "";
CloseableHttpClient httpClient = setHttpClient();
try {
res = HttpUtil.post(httpClient, target, requestParam);
} catch (Exception ex) {
throw new EventMeshException(ex);
} finally {
httpClient.close();
}

if (logger.isDebugEnabled()) {
Expand Down Expand Up @@ -246,32 +246,17 @@ public void request(LiteMessage message, RRCallback rrCallback, long timeout) th

long startTime = System.currentTimeMillis();
String target = selectEventMesh();
CloseableHttpClient httpClient = setHttpClient();
try {
HttpUtil.post(httpClient, null, target, requestParam, new RRCallbackResponseHandlerAdapter(message, rrCallback, timeout));
} catch (Exception ex) {
throw new EventMeshException(ex);
} finally {
httpClient.close();
}

if (logger.isDebugEnabled()) {
logger.debug("publish sync message by async, target:{}, cost:{}, message:{}", target, System.currentTimeMillis() - startTime, message);
}
}

public static void setHttpClient() {
SSLContext sslContext = null;
try {
String protocol = System.getProperty("ssl.client.protocol", "TLSv1.1");
TrustManager[] tm = new TrustManager[]{new MyX509TrustManager()};
sslContext = SSLContext.getInstance(protocol);
sslContext.init(null, tm, new SecureRandom());
httpClient = HttpClients.custom().setSSLContext(sslContext)
.setSSLHostnameVerifier(new DefaultHostnameVerifier()).build();
} catch (NoSuchAlgorithmException e) {
e.printStackTrace();
} catch (KeyManagementException e) {
e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
}
}
}
2 changes: 1 addition & 1 deletion eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/sub/service/SubService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void cleanup() {
logger.info("start destory ....");
try {
liteConsumer.unsubscribe(topicList, url);
} catch (EventMeshException e) {
} catch (Exception e) {
e.printStackTrace();
}
try {
Expand Down