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 #4133]Optimize OpenFunctionSourceConnector poll #4134

Merged
merged 1 commit into from
Jun 27, 2023
Merged

[ISSUE #4133]Optimize OpenFunctionSourceConnector poll #4134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 17 additions & 4 deletions ...apache/eventmesh/connector/openfunction/source/connector/OpenFunctionSourceConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,15 @@
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;

import lombok.extern.slf4j.Slf4j;

@Slf4j
public class OpenFunctionSourceConnector implements Source {

private static final int DEFAULT_BATCH_SIZE = 10;

private OpenFunctionSourceConfig sourceConfig;

private BlockingQueue<ConnectRecord> queue;
Expand Down Expand Up @@ -74,10 +77,20 @@ public BlockingQueue<ConnectRecord> queue() {

@Override
public List<ConnectRecord> poll() {
List<ConnectRecord> connectRecords = new ArrayList<>();
ConnectRecord connectRecord = queue.poll();
if (connectRecord != null) {
connectRecords.add(connectRecord);

List<ConnectRecord> connectRecords = new ArrayList<>(DEFAULT_BATCH_SIZE);

for (int count = 0; count < DEFAULT_BATCH_SIZE; ++count) {
try {
ConnectRecord connectRecord = queue.poll(3, TimeUnit.SECONDS);
if (connectRecord == null) {
break;
}
connectRecords.add(connectRecord);
} catch (InterruptedException e) {
// nothing to do
break;
}
}
return connectRecords;
}
Expand Down
12 changes: 8 additions & 4 deletions ...entmesh-openconnect-java/src/main/java/org/apache/eventmesh/openconnect/SourceWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import org.apache.eventmesh.openconnect.api.data.ConnectRecord;
import org.apache.eventmesh.openconnect.api.source.Source;

import org.apache.commons.collections4.CollectionUtils;

import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.List;
Expand Down Expand Up @@ -120,7 +122,7 @@ public void startPoll() {
try {
connectRecord = queue.poll(5, TimeUnit.SECONDS);
} catch (InterruptedException e) {
e.printStackTrace();
Thread.currentThread().interrupt();
log.error("poll connect record error", e);
}
if (connectRecord == null) {
Expand All @@ -136,8 +138,11 @@ private void startConnector() throws Exception {
source.start();
while (isRunning) {
List<ConnectRecord> connectorRecordList = source.poll();
for (ConnectRecord connectRecord : connectorRecordList) {
queue.put(connectRecord);
if (CollectionUtils.isEmpty(connectorRecordList)) {
continue;
}
for (ConnectRecord record : connectorRecordList) {
queue.put(record);
}
}
}
Expand Down Expand Up @@ -175,7 +180,6 @@ public void stop() {
try {
eventMeshTCPClient.close();
} catch (Exception e) {
e.printStackTrace();
log.error("event mesh client close error", e);
}
log.info("source worker stopped");
Expand Down
Loading