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

[ISSUE #4804] Fix SubStreamHandler exception loop by closeOnError #4807

Merged
merged 9 commits into from
Apr 13, 2024
Merged

[ISSUE #4804] Fix SubStreamHandler exception loop by closeOnError #4807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a540e8a
Handle exception loop by closeOnError
Pil0tXia Apr 2, 2024
e9c7ce9
Lombok optimization
Pil0tXia Apr 2, 2024
f5898d8
some format optimization
Pil0tXia Apr 2, 2024
774397f
Avoid closing multiple times
Pil0tXia Apr 11, 2024
d0ac6c0
Remove redundant set null
Pil0tXia Apr 12, 2024
878009a
Revert "Avoid closing multiple times"
Pil0tXia Apr 12, 2024
8e812cd
Use synchronized latch to keep senderOnComplete called once
Pil0tXia Apr 13, 2024
4d86948
Use boolean to prevent latch called by somebody else
Pil0tXia Apr 13, 2024
dbabca7
Remove the unique callee/caller close() of onCompleted()
Pil0tXia Apr 13, 2024
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
46 changes: 12 additions & 34 deletions ...k-java/src/main/java/org/apache/eventmesh/client/grpc/consumer/EventMeshGrpcConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ public EventMeshGrpcConsumer(final EventMeshGrpcClientConfig clientConfig) {
}

public void init() {
this.channel = ManagedChannelBuilder.forAddress(clientConfig.getServerAddr(), clientConfig.getServerPort()).usePlaintext()
.build();
this.channel = ManagedChannelBuilder.forAddress(clientConfig.getServerAddr(), clientConfig.getServerPort()).usePlaintext().build();
this.consumerClient = ConsumerServiceGrpc.newBlockingStub(channel);
this.consumerAsyncClient = ConsumerServiceGrpc.newStub(channel);
this.heartbeatClient = HeartbeatServiceGrpc.newBlockingStub(channel);
Expand Down Expand Up @@ -125,8 +124,8 @@ public void subscribe(final List<SubscriptionItem> subscriptionItems) {

addSubscription(subscriptionItems, SDK_STREAM_URL, GrpcType.STREAM);

CloudEvent subscription = EventMeshCloudEventBuilder.buildEventSubscription(clientConfig, EventMeshProtocolType.EVENT_MESH_MESSAGE, null,
subscriptionItems);
CloudEvent subscription = EventMeshCloudEventBuilder.buildEventSubscription(
clientConfig, EventMeshProtocolType.EVENT_MESH_MESSAGE, null, subscriptionItems);
synchronized (this) {
if (subStreamHandler == null) {
subStreamHandler = new SubStreamHandler<>(consumerAsyncClient, clientConfig, listener);
Expand All @@ -137,8 +136,8 @@ public void subscribe(final List<SubscriptionItem> subscriptionItems) {
}

private Response subscribeWebhook(List<SubscriptionItem> subscriptionItems, String url) {
final CloudEvent subscription = EventMeshCloudEventBuilder.buildEventSubscription(clientConfig, EventMeshProtocolType.EVENT_MESH_MESSAGE,
url, subscriptionItems);
final CloudEvent subscription = EventMeshCloudEventBuilder.buildEventSubscription(
clientConfig, EventMeshProtocolType.EVENT_MESH_MESSAGE, url, subscriptionItems);
try {
CloudEvent response = consumerClient.subscribe(subscription);
log.info("Received response:{}", response);
Expand Down Expand Up @@ -169,8 +168,8 @@ public Response unsubscribe(final List<SubscriptionItem> subscriptionItems, fina

removeSubscription(subscriptionItems);

final CloudEvent cloudEvent = EventMeshCloudEventBuilder.buildEventSubscription(clientConfig, EventMeshProtocolType.EVENT_MESH_MESSAGE, url,
subscriptionItems);
final CloudEvent cloudEvent = EventMeshCloudEventBuilder.buildEventSubscription(
clientConfig, EventMeshProtocolType.EVENT_MESH_MESSAGE, url, subscriptionItems);
try {
final CloudEvent response = consumerClient.unsubscribe(cloudEvent);
log.info("Received response:{}", response);
Expand All @@ -191,8 +190,8 @@ public Response unsubscribe(final List<SubscriptionItem> subscriptionItems) {

removeSubscription(subscriptionItems);

final CloudEvent cloudEvent = EventMeshCloudEventBuilder.buildEventSubscription(clientConfig, EventMeshProtocolType.EVENT_MESH_MESSAGE, null,
subscriptionItems);
final CloudEvent cloudEvent = EventMeshCloudEventBuilder.buildEventSubscription(
clientConfig, EventMeshProtocolType.EVENT_MESH_MESSAGE, null, subscriptionItems);

try {
final CloudEvent response = consumerClient.unsubscribe(cloudEvent);
Expand Down Expand Up @@ -277,14 +276,12 @@ private void resubscribe() {

subscriptionGroup.forEach((url, items) -> {
if (isStreamSub.get()) {
CloudEvent subscription = EventMeshCloudEventBuilder.buildEventSubscription(clientConfig, EventMeshProtocolType.EVENT_MESH_MESSAGE,
url,
items);
CloudEvent subscription = EventMeshCloudEventBuilder.buildEventSubscription(
clientConfig, EventMeshProtocolType.EVENT_MESH_MESSAGE, url, items);
subStreamHandler.sendSubscription(subscription);
} else {
subscribeWebhook(items, url);
}

});
}

Expand All @@ -303,6 +300,7 @@ public void close() {
}
}

@Data
private static class SubscriptionInfo {

private transient SubscriptionItem subscriptionItem;
Expand All @@ -314,25 +312,5 @@ private static class SubscriptionInfo {
this.url = url;
this.grpcType = grpcType;
}

public GrpcType getGrpcType() {
return grpcType;
}

public SubscriptionItem getSubscriptionItem() {
return subscriptionItem;
}

public void setSubscriptionItem(final SubscriptionItem subscriptionItem) {
this.subscriptionItem = subscriptionItem;
}

public String getUrl() {
return url;
}

public void setUrl(final String url) {
this.url = url;
}
}
}
4 changes: 2 additions & 2 deletions ...sh-sdk-java/src/main/java/org/apache/eventmesh/client/grpc/consumer/SubStreamHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ public void onNext(final CloudEvent message) {
@Override
public void onError(final Throwable t) {
log.error("Received Server side error", t);
close();
}

@Override
public void onCompleted() {
log.info("Finished receiving messages from server.");
close();
}
};
}
Expand Down Expand Up @@ -134,7 +134,6 @@ public void close() {
}

latch.countDown();

log.info("SubStreamHandler closed.");
}

Expand All @@ -145,6 +144,7 @@ private void senderOnNext(final CloudEvent subscription) {
}
} catch (Exception e) {
log.error("StreamObserver Error onNext", e);
close();
}
}

Expand Down
Loading