Skip to content

fix: 修复broker集群宕机情况下，客户端刷新连接时，若各连接抛出异常时机不一致，则仍未抛出异常的连接uri无法加入unHealth… #1

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: 修复broker集群宕机情况下，客户端刷新连接时，若各连接抛出异常时机不一致，则仍未抛出异常的连接uri无法加入unHealth… #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e31832c
fix: 修复broker集群宕机情况下，客户端刷新连接时，若各连接抛出异常时机不一致，则仍未抛出异常的连接uri无法加入unHealth…
fanpipi Jul 10, 2024
a58fb47
fix: 修复当客户端与broker集群断连后，集群监控未处理NoAvailableConnectionException异常，导致集群监…
fanpipi Jul 15, 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
3 changes: 2 additions & 1 deletion alibaba-rsocket-core/src/main/java/com/alibaba/rsocket/loadbalance/LoadBalancedRSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,11 @@ private void refreshRsockets(Collection<String> rsocketUris) {
return connect(rsocketUri)
//health check after connection
.flatMap(rsocket -> healthCheck(rsocket, rsocketUri).map(payload -> Tuples.of(rsocketUri, rsocket)))
.doOnError(error -> {
.onErrorResume(error -> {
log.error(RsocketErrorCode.message("RST-400500", rsocketUri), error);
this.unHealthyUriSet.add(rsocketUri);
tryToReconnect(rsocketUri, error);
return Mono.empty();
});
}
})
Expand Down
6 changes: 3 additions & 3 deletions alibaba-rsocket-core/src/main/java/com/alibaba/rsocket/upstream/UpstreamManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ public void monitorClusters() {
if (!brokerCluster.isLocal()) {
//interval sync to broker to get last broker list in case of UpstreamClusterChangedEvent lost
Flux.interval(Duration.ofSeconds(120))
.flatMap(timestamp -> findBrokerDiscoveryService().getInstances("*"))
.map(serviceInstances -> serviceInstances.stream().map(RSocketServiceInstance::getUri).collect(Collectors.toList()))
.subscribe(uris -> brokerCluster.setUris(uris));
.subscribe(timestamp -> findBrokerDiscoveryService().getInstances("*")
.map(serviceInstances -> serviceInstances.stream().map(RSocketServiceInstance::getUri).collect(Collectors.toList()))
.subscribe(uris -> brokerCluster.setUris(uris)));
}
if (p2pServices != null && !p2pServices.isEmpty()) {
// interval sync to p2p service instances list
Expand Down