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: Start mgmt server before xds server 

The xds server can take a really long time to start if the xds resources
are slow to load. Ideally the management server would be available
during this time so we can inspect the server. The server health still
won't go to SERVING until the xds server starts, which is appropriate.
This commit is contained in:
Eric Anderson 2023-04-19 15:24:58 -07:00
parent 9204223c16
commit c35870bce0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,14 +176,6 @@ public final class XdsTestServer {
} }
health = new HealthStatusManager(); health = new HealthStatusManager();
if (secureMode) { if (secureMode) {
server =
XdsServerBuilder.forPort(
port, XdsServerCredentials.create(InsecureServerCredentials.create()))
.addService(
ServerInterceptors.intercept(
new TestServiceImpl(serverId, host), new TestInfoInterceptor(host)))
.build();
server.start();
maintenanceServer = maintenanceServer =
NettyServerBuilder.forPort(maintenancePort) NettyServerBuilder.forPort(maintenancePort)
.addService(new XdsUpdateHealthServiceImpl(health)) .addService(new XdsUpdateHealthServiceImpl(health))
@ -192,6 +184,14 @@ public final class XdsTestServer {
.addServices(AdminInterface.getStandardServices()) .addServices(AdminInterface.getStandardServices())
.build(); .build();
maintenanceServer.start(); maintenanceServer.start();
server =
XdsServerBuilder.forPort(
port, XdsServerCredentials.create(InsecureServerCredentials.create()))
.addService(
ServerInterceptors.intercept(
new TestServiceImpl(serverId, host), new TestInfoInterceptor(host)))
.build();
server.start();
} else { } else {
server = server =
NettyServerBuilder.forPort(port) NettyServerBuilder.forPort(port)