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

[3.0-Triple] Add health service cancel handler #9004

Merged
merged 3 commits into from
Oct 12, 2021
Merged

[3.0-Triple] Add health service cancel handler #9004

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e17def6
add health service cancel handler
Oct 9, 2021
481bf9e
change log
Oct 9, 2021
b920452
change indent style
Oct 11, 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
27 changes: 20 additions & 7 deletions ...bbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/service/TriHealthImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@

package org.apache.dubbo.rpc.protocol.tri.service;

import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.stream.StreamObserver;
import org.apache.dubbo.rpc.RpcContext;
import org.apache.dubbo.rpc.RpcException;

import grpc.health.v1.Health;
Expand All @@ -28,14 +31,12 @@
import java.util.IdentityHashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;

import static org.apache.dubbo.rpc.RpcException.METHOD_NOT_FOUND;

public class TriHealthImpl implements Health {

private static final Logger logger = Logger.getLogger(TriHealthImpl.class.getName());
private static final Logger logger = LoggerFactory.getLogger(TriHealthImpl.class);

// Due to the latency of rpc calls, synchronization of the map does not help with consistency.
// However, need use ConcurrentHashMap to allow concurrent reading by check().
Expand Down Expand Up @@ -82,13 +83,25 @@ public void watch(HealthCheckRequest request, StreamObserver<HealthCheckResponse
}
serviceWatchers.put(responseObserver, Boolean.TRUE);
}
// todo add client cancel listener
RpcContext.getCancellationContext()
.addListener(context -> {
synchronized (watchLock) {
IdentityHashMap<StreamObserver<HealthCheckResponse>, Boolean> serviceWatchers =
watchers.get(service);
if (serviceWatchers != null) {
serviceWatchers.remove(responseObserver);
if (serviceWatchers.isEmpty()) {
watchers.remove(service);
}
}
}
});
}

void setStatus(String service, HealthCheckResponse.ServingStatus status) {
synchronized (watchLock) {
if (terminal) {
logger.log(Level.FINE, "Ignoring status {} for {}", new Object[]{status, service});
logger.info("Ignoring status " + status + " for " + service);
return;
}
setStatusInternal(service, status);
Expand All @@ -105,7 +118,7 @@ private void setStatusInternal(String service, HealthCheckResponse.ServingStatus
void clearStatus(String service) {
synchronized (watchLock) {
if (terminal) {
logger.log(Level.FINE, "Ignoring status clearing for {}", new Object[]{service});
logger.info("Ignoring status clearing for " + service);
return;
}
HealthCheckResponse.ServingStatus prevStatus = statusMap.remove(service);
Expand All @@ -118,7 +131,7 @@ void clearStatus(String service) {
void enterTerminalState() {
synchronized (watchLock) {
if (terminal) {
logger.log(Level.WARNING, "Already terminating", new RuntimeException());
logger.warn("Already terminating", new RuntimeException());
return;
}
terminal = true;
Expand Down