Skip to content

Commit d4151d0

Browse files
Fix gRPC initialized even without aux type registered (#18928)
* Fix gRPC initialized even without aux type registered. Signed-off-by: Finn Carroll <carrofin@amazon.com> * Spotless apply Signed-off-by: Finn Carroll <carrofin@amazon.com> --------- Signed-off-by: Finn Carroll <carrofin@amazon.com>
1 parent f40ad67 commit d4151d0

File tree

1 file changed

+9
-8
lines changed
  • modules/transport-grpc/src/main/java/org/opensearch/transport/grpc

1 file changed

+9
-8
lines changed

modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/GrpcPlugin.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545

4646
import io.grpc.BindableService;
4747

48+
import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.GRPC_TRANSPORT_SETTING_KEY;
4849
import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_BIND_HOST;
4950
import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_HOST;
5051
import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_KEEPALIVE_TIMEOUT;
@@ -55,6 +56,7 @@
5556
import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_PUBLISH_HOST;
5657
import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_PUBLISH_PORT;
5758
import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.SETTING_GRPC_WORKER_COUNT;
59+
import static org.opensearch.transport.grpc.ssl.SecureNetty4GrpcServerTransport.GRPC_SECURE_TRANSPORT_SETTING_KEY;
5860
import static org.opensearch.transport.grpc.ssl.SecureNetty4GrpcServerTransport.SETTING_GRPC_SECURE_PORT;
5961

6062
/**
@@ -143,8 +145,10 @@ public Map<String, Supplier<AuxTransport>> getAuxTransports(
143145
new DocumentServiceImpl(client),
144146
new SearchServiceImpl(client, queryUtils)
145147
);
146-
AuxTransport transport = new Netty4GrpcServerTransport(settings, grpcServices, networkService);
147-
return Collections.singletonMap(transport.settingKey(), () -> transport);
148+
return Collections.singletonMap(
149+
GRPC_TRANSPORT_SETTING_KEY,
150+
() -> new Netty4GrpcServerTransport(settings, grpcServices, networkService)
151+
);
148152
}
149153

150154
/**
@@ -184,13 +188,10 @@ public Map<String, Supplier<AuxTransport>> getSecureAuxTransports(
184188
new DocumentServiceImpl(client),
185189
new SearchServiceImpl(client, queryUtils)
186190
);
187-
AuxTransport transport = new SecureNetty4GrpcServerTransport(
188-
settings,
189-
grpcServices,
190-
networkService,
191-
secureAuxTransportSettingsProvider
191+
return Collections.singletonMap(
192+
GRPC_SECURE_TRANSPORT_SETTING_KEY,
193+
() -> new SecureNetty4GrpcServerTransport(settings, grpcServices, networkService, secureAuxTransportSettingsProvider)
192194
);
193-
return Collections.singletonMap(transport.settingKey(), () -> transport);
194195
}
195196

196197
/**

0 commit comments

Comments
 (0)