Skip to content

xds: Stabilize CsdsService #11003

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

Merged
merged 1 commit into from
Mar 11, 2024
Merged

xds: Stabilize CsdsService #11003

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
63 changes: 36 additions & 27 deletions xds/src/main/java/io/grpc/xds/CsdsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
import io.envoyproxy.envoy.service.status.v3.ClientStatusDiscoveryServiceGrpc;
import io.envoyproxy.envoy.service.status.v3.ClientStatusRequest;
import io.envoyproxy.envoy.service.status.v3.ClientStatusResponse;
import io.grpc.ExperimentalApi;
import io.grpc.BindableService;
import io.grpc.ServerServiceDefinition;
import io.grpc.Status;
import io.grpc.StatusException;
import io.grpc.internal.ObjectPool;
Expand All @@ -55,11 +56,10 @@
*
* @since 1.37.0
*/
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/8016")
public final class CsdsService extends
ClientStatusDiscoveryServiceGrpc.ClientStatusDiscoveryServiceImplBase {
public final class CsdsService implements BindableService {
private static final Logger logger = Logger.getLogger(CsdsService.class.getName());
private final XdsClientPoolFactory xdsClientPoolFactory;
private final CsdsServiceInternal delegate = new CsdsServiceInternal();

@VisibleForTesting
CsdsService(XdsClientPoolFactory xdsClientPoolFactory) {
Expand All @@ -76,34 +76,43 @@ public static CsdsService newInstance() {
}

@Override
public void fetchClientStatus(
ClientStatusRequest request, StreamObserver<ClientStatusResponse> responseObserver) {
if (handleRequest(request, responseObserver)) {
responseObserver.onCompleted();
}
// TODO(sergiitk): Add a case covering mutating handleRequest return false to true - to verify
// that responseObserver.onCompleted() isn't erroneously called on error.
public ServerServiceDefinition bindService() {
return delegate.bindService();
}

@Override
public StreamObserver<ClientStatusRequest> streamClientStatus(
final StreamObserver<ClientStatusResponse> responseObserver) {
return new StreamObserver<ClientStatusRequest>() {
@Override
public void onNext(ClientStatusRequest request) {
handleRequest(request, responseObserver);
/** Hide protobuf from being exposed via the API. */
private final class CsdsServiceInternal
extends ClientStatusDiscoveryServiceGrpc.ClientStatusDiscoveryServiceImplBase {
@Override
public void fetchClientStatus(
ClientStatusRequest request, StreamObserver<ClientStatusResponse> responseObserver) {
if (handleRequest(request, responseObserver)) {
responseObserver.onCompleted();
}
// TODO(sergiitk): Add a case covering mutating handleRequest return false to true - to verify
// that responseObserver.onCompleted() isn't erroneously called on error.
}

@Override
public void onError(Throwable t) {
onCompleted();
}
@Override
public StreamObserver<ClientStatusRequest> streamClientStatus(
final StreamObserver<ClientStatusResponse> responseObserver) {
return new StreamObserver<ClientStatusRequest>() {
@Override
public void onNext(ClientStatusRequest request) {
handleRequest(request, responseObserver);
}

@Override
public void onCompleted() {
responseObserver.onCompleted();
}
};
@Override
public void onError(Throwable t) {
onCompleted();
}

@Override
public void onCompleted() {
responseObserver.onCompleted();
}
};
}
}

private boolean handleRequest(
Expand Down