Copilot commented on code in PR #17358:
URL: https://github.com/apache/pinot/pull/17358#discussion_r2652659998
##########
pinot-common/src/main/java/org/apache/pinot/common/utils/ClientSSLContextGenerator.java:
##########
@@ -72,6 +79,12 @@ public ClientSSLContextGenerator(PinotConfiguration
sslConfig) {
if ((_keyStorePassword == null && _keyStoreFile != null) ||
(_keyStorePassword != null && _keyStoreFile == null)) {
throw new IllegalArgumentException("Invalid configuration of keystore
file and passowrd");
Review Comment:
Corrected spelling of 'passowrd' to 'password'.
```suggestion
throw new IllegalArgumentException("Invalid configuration of keystore
file and password");
```
##########
pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/MailboxService.java:
##########
@@ -192,4 +203,74 @@ private static Duration getIdleTimeout(PinotConfiguration
config) {
// Use a reasonable maximum idle timeout (1 year) to avoid overflow.
return Duration.ofDays(365);
}
+
+ @Nullable
+ private static SslContext resolveClientSslContext(InstanceType instanceType,
@Nullable TlsConfig tlsConfig) {
+ if (tlsConfig == null) {
+ return null;
+ }
+ switch (instanceType) {
+ case BROKER: {
+ SslContext sslContext =
QueryRuntimeContext.getInstance().getClientGrpcSslContext();
+ if (sslContext == null) {
+ sslContext = ServerGrpcQueryClient.buildSslContext(tlsConfig);
+
QueryRuntimeContext.getInstance().setClientGrpcSslContext(sslContext);
+ }
+ return sslContext;
+ }
+ case SERVER: {
+ SslContext sslContext =
QueryRuntimeContext.getInstance().getClientGrpcSslContext();
+ if (sslContext == null) {
+ sslContext = ServerGrpcQueryClient.buildSslContext(tlsConfig);
+
QueryRuntimeContext.getInstance().setClientGrpcSslContext(sslContext);
+ }
+ return sslContext;
+ }
+ case CONTROLLER: {
+ SslContext sslContext =
QueryRuntimeContext.getInstance().getClientGrpcSslContext();
+ if (sslContext == null) {
+ sslContext = ServerGrpcQueryClient.buildSslContext(tlsConfig);
+
QueryRuntimeContext.getInstance().setClientGrpcSslContext(sslContext);
+ }
+ return sslContext;
+ }
+ default:
+ return ServerGrpcQueryClient.buildSslContext(tlsConfig);
+ }
+ }
+
+ @Nullable
+ private static SslContext resolveServerSslContext(InstanceType instanceType,
@Nullable TlsConfig tlsConfig) {
+ if (tlsConfig == null) {
+ return null;
+ }
+ switch (instanceType) {
+ case BROKER: {
+ SslContext sslContext =
QueryRuntimeContext.getInstance().getServerGrpcSslContext();
+ if (sslContext == null) {
+ sslContext = GrpcQueryServer.buildGrpcSslContext(tlsConfig);
+
QueryRuntimeContext.getInstance().setServerGrpcSslContext(sslContext);
+ }
+ return sslContext;
+ }
+ case SERVER: {
+ SslContext sslContext =
QueryRuntimeContext.getInstance().getServerGrpcSslContext();
+ if (sslContext == null) {
+ sslContext = GrpcQueryServer.buildGrpcSslContext(tlsConfig);
+
QueryRuntimeContext.getInstance().setServerGrpcSslContext(sslContext);
+ }
+ return sslContext;
+ }
+ case CONTROLLER: {
+ SslContext sslContext =
QueryRuntimeContext.getInstance().getServerGrpcSslContext();
+ if (sslContext == null) {
+ sslContext = GrpcQueryServer.buildGrpcSslContext(tlsConfig);
+
QueryRuntimeContext.getInstance().setServerGrpcSslContext(sslContext);
+ }
+ return sslContext;
+ }
+ default:
+ return GrpcQueryServer.buildGrpcSslContext(tlsConfig);
+ }
+ }
Review Comment:
The BROKER, SERVER, and CONTROLLER cases contain identical code. Extract
this logic into a helper method to eliminate the duplication and improve
maintainability.
```suggestion
case BROKER:
case SERVER:
case CONTROLLER:
return getOrBuildClientSslContext(tlsConfig);
default:
return ServerGrpcQueryClient.buildSslContext(tlsConfig);
}
}
private static SslContext getOrBuildClientSslContext(TlsConfig tlsConfig) {
SslContext sslContext =
QueryRuntimeContext.getInstance().getClientGrpcSslContext();
if (sslContext == null) {
sslContext = ServerGrpcQueryClient.buildSslContext(tlsConfig);
QueryRuntimeContext.getInstance().setClientGrpcSslContext(sslContext);
}
return sslContext;
}
@Nullable
private static SslContext resolveServerSslContext(InstanceType
instanceType, @Nullable TlsConfig tlsConfig) {
if (tlsConfig == null) {
return null;
}
switch (instanceType) {
case BROKER:
case SERVER:
case CONTROLLER:
return getOrBuildServerSslContext(tlsConfig);
default:
return GrpcQueryServer.buildGrpcSslContext(tlsConfig);
}
}
private static SslContext getOrBuildServerSslContext(TlsConfig tlsConfig) {
SslContext sslContext =
QueryRuntimeContext.getInstance().getServerGrpcSslContext();
if (sslContext == null) {
sslContext = GrpcQueryServer.buildGrpcSslContext(tlsConfig);
QueryRuntimeContext.getInstance().setServerGrpcSslContext(sslContext);
}
return sslContext;
}
```
##########
pinot-query-runtime/src/main/java/org/apache/pinot/query/mailbox/MailboxService.java:
##########
@@ -192,4 +203,74 @@ private static Duration getIdleTimeout(PinotConfiguration
config) {
// Use a reasonable maximum idle timeout (1 year) to avoid overflow.
return Duration.ofDays(365);
}
+
+ @Nullable
+ private static SslContext resolveClientSslContext(InstanceType instanceType,
@Nullable TlsConfig tlsConfig) {
+ if (tlsConfig == null) {
+ return null;
+ }
+ switch (instanceType) {
+ case BROKER: {
+ SslContext sslContext =
QueryRuntimeContext.getInstance().getClientGrpcSslContext();
+ if (sslContext == null) {
+ sslContext = ServerGrpcQueryClient.buildSslContext(tlsConfig);
+
QueryRuntimeContext.getInstance().setClientGrpcSslContext(sslContext);
+ }
+ return sslContext;
+ }
+ case SERVER: {
+ SslContext sslContext =
QueryRuntimeContext.getInstance().getClientGrpcSslContext();
+ if (sslContext == null) {
+ sslContext = ServerGrpcQueryClient.buildSslContext(tlsConfig);
+
QueryRuntimeContext.getInstance().setClientGrpcSslContext(sslContext);
+ }
+ return sslContext;
+ }
+ case CONTROLLER: {
+ SslContext sslContext =
QueryRuntimeContext.getInstance().getClientGrpcSslContext();
+ if (sslContext == null) {
+ sslContext = ServerGrpcQueryClient.buildSslContext(tlsConfig);
+
QueryRuntimeContext.getInstance().setClientGrpcSslContext(sslContext);
+ }
+ return sslContext;
+ }
+ default:
+ return ServerGrpcQueryClient.buildSslContext(tlsConfig);
+ }
+ }
+
+ @Nullable
+ private static SslContext resolveServerSslContext(InstanceType instanceType,
@Nullable TlsConfig tlsConfig) {
+ if (tlsConfig == null) {
+ return null;
+ }
+ switch (instanceType) {
+ case BROKER: {
+ SslContext sslContext =
QueryRuntimeContext.getInstance().getServerGrpcSslContext();
+ if (sslContext == null) {
+ sslContext = GrpcQueryServer.buildGrpcSslContext(tlsConfig);
+
QueryRuntimeContext.getInstance().setServerGrpcSslContext(sslContext);
+ }
+ return sslContext;
+ }
+ case SERVER: {
+ SslContext sslContext =
QueryRuntimeContext.getInstance().getServerGrpcSslContext();
+ if (sslContext == null) {
+ sslContext = GrpcQueryServer.buildGrpcSslContext(tlsConfig);
+
QueryRuntimeContext.getInstance().setServerGrpcSslContext(sslContext);
+ }
+ return sslContext;
+ }
+ case CONTROLLER: {
+ SslContext sslContext =
QueryRuntimeContext.getInstance().getServerGrpcSslContext();
+ if (sslContext == null) {
+ sslContext = GrpcQueryServer.buildGrpcSslContext(tlsConfig);
+
QueryRuntimeContext.getInstance().setServerGrpcSslContext(sslContext);
+ }
+ return sslContext;
+ }
+ default:
+ return GrpcQueryServer.buildGrpcSslContext(tlsConfig);
+ }
+ }
Review Comment:
The BROKER, SERVER, and CONTROLLER cases contain identical code. Extract
this logic into a helper method to eliminate the duplication and improve
maintainability.
```suggestion
case BROKER:
case SERVER:
case CONTROLLER:
return getOrBuildClientSslContext(tlsConfig);
default:
return ServerGrpcQueryClient.buildSslContext(tlsConfig);
}
}
private static SslContext getOrBuildClientSslContext(TlsConfig tlsConfig) {
SslContext sslContext =
QueryRuntimeContext.getInstance().getClientGrpcSslContext();
if (sslContext == null) {
sslContext = ServerGrpcQueryClient.buildSslContext(tlsConfig);
QueryRuntimeContext.getInstance().setClientGrpcSslContext(sslContext);
}
return sslContext;
}
@Nullable
private static SslContext resolveServerSslContext(InstanceType
instanceType, @Nullable TlsConfig tlsConfig) {
if (tlsConfig == null) {
return null;
}
switch (instanceType) {
case BROKER:
case SERVER:
case CONTROLLER:
return getOrBuildServerSslContext(tlsConfig);
default:
return GrpcQueryServer.buildGrpcSslContext(tlsConfig);
}
}
private static SslContext getOrBuildServerSslContext(TlsConfig tlsConfig) {
SslContext sslContext =
QueryRuntimeContext.getInstance().getServerGrpcSslContext();
if (sslContext == null) {
sslContext = GrpcQueryServer.buildGrpcSslContext(tlsConfig);
QueryRuntimeContext.getInstance().setServerGrpcSslContext(sslContext);
}
return sslContext;
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
