grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

interop-testing: xDS interop app uses AdminInterface

This commit is contained in:
Sergii Tkachenko 2021-03-30 12:45:20 -04:00 committed by Sergii Tkachenko
parent 4896a0fee8
commit 11c3667b8c
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
interop-testing/src/main/java/io/grpc/testing/integration/XdsTestClient.java
View File

@ -41,7 +41,7 @@ import io.grpc.Server;
import io.grpc.Status;
import io.grpc.netty.NettyServerBuilder;
import io.grpc.protobuf.services.ProtoReflectionService;
import io.grpc.services.ChannelzService;
import io.grpc.services.AdminInterface;
import io.grpc.stub.StreamObserver;
import io.grpc.testing.integration.Messages.ClientConfigureRequest;
import io.grpc.testing.integration.Messages.ClientConfigureRequest.RpcType;
@ -80,7 +80,6 @@ public final class XdsTestClient {
private final Object lock = new Object();
private final List<ManagedChannel> channels = new ArrayList<>();
private final StatsAccumulator statsAccumulator = new StatsAccumulator();
private static final int CHANNELZ_MAX_PAGE_SIZE = 100;
private int numChannels = 1;
private boolean printResponse = false;
@ -247,7 +246,7 @@ public final class XdsTestClient {
.addService(new XdsStatsImpl())
.addService(new ConfigureUpdateServiceImpl())
.addService(ProtoReflectionService.newInstance())
.addService(ChannelzService.newInstance(CHANNELZ_MAX_PAGE_SIZE))
.addServices(AdminInterface.getStandardServices())
.build();
try {
statsServer.start();

7
interop-testing/src/main/java/io/grpc/testing/integration/XdsTestServer.java
View File

@ -31,7 +31,7 @@ import io.grpc.StatusRuntimeException;
import io.grpc.health.v1.HealthCheckResponse.ServingStatus;
import io.grpc.netty.NettyServerBuilder;
import io.grpc.protobuf.services.ProtoReflectionService;
import io.grpc.services.ChannelzService;
import io.grpc.services.AdminInterface;
import io.grpc.services.HealthStatusManager;
import io.grpc.stub.StreamObserver;
import io.grpc.testing.integration.Messages.SimpleRequest;
@ -54,7 +54,6 @@ public final class XdsTestServer {
Context.key("rpc-behavior");
private static final String CALL_BEHAVIOR_KEEP_OPEN_VALUE = "keep-open";
private static final String CALL_BEHAVIOR_SLEEP_VALUE = "sleep-";
private static final int CHANNELZ_MAX_PAGE_SIZE = 100;
private static Logger logger = Logger.getLogger(XdsTestServer.class.getName());
@ -180,7 +179,7 @@ public final class XdsTestServer {
.addService(new XdsUpdateHealthServiceImpl(health))
.addService(health.getHealthService())
.addService(ProtoReflectionService.newInstance())
.addService(ChannelzService.newInstance(CHANNELZ_MAX_PAGE_SIZE))
.addServices(AdminInterface.getStandardServices())
.build()
.start();
} else {
@ -192,7 +191,7 @@ public final class XdsTestServer {
.addService(new XdsUpdateHealthServiceImpl(health))
.addService(health.getHealthService())
.addService(ProtoReflectionService.newInstance())
.addService(ChannelzService.newInstance(CHANNELZ_MAX_PAGE_SIZE))
.addServices(AdminInterface.getStandardServices())
.build()
.start();
maintenanceServer = null;