Skip to content

Commit df4a4f2

Browse files
committed
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.
1 parent e3b56e1 commit df4a4f2

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,14 +176,6 @@ private void start() throws Exception {
176176
}
177177
health = new HealthStatusManager();
178178
if (secureMode) {
179-
server =
180-
XdsServerBuilder.forPort(
181-
port, XdsServerCredentials.create(InsecureServerCredentials.create()))
182-
.addService(
183-
ServerInterceptors.intercept(
184-
new TestServiceImpl(serverId, host), new TestInfoInterceptor(host)))
185-
.build();
186-
server.start();
187179
maintenanceServer =
188180
NettyServerBuilder.forPort(maintenancePort)
189181
.addService(new XdsUpdateHealthServiceImpl(health))
@@ -192,6 +184,14 @@ private void start() throws Exception {
192184
.addServices(AdminInterface.getStandardServices())
193185
.build();
194186
maintenanceServer.start();
187+
server =
188+
XdsServerBuilder.forPort(
189+
port, XdsServerCredentials.create(InsecureServerCredentials.create()))
190+
.addService(
191+
ServerInterceptors.intercept(
192+
new TestServiceImpl(serverId, host), new TestInfoInterceptor(host)))
193+
.build();
194+
server.start();
195195
} else {
196196
server =
197197
NettyServerBuilder.forPort(port)

0 commit comments

Comments
 (0)