Merge pull request quarkusio#31287 from faculbsz-sg/grpc-permit-keep-…

…alive Adding server grpc netty permit-keep-alive-time and permit-keep-alive-without-calls
gsmet · Feb 28, 2023 · 269da7b · 269da7b
2 parents fcc117d + 1a716df
commit 269da7b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/GrpcServerRecorder.java
@@ -36,6 +36,7 @@
 import io.grpc.ServerInterceptors;
 import io.grpc.ServerMethodDefinition;
 import io.grpc.ServerServiceDefinition;
+import io.grpc.netty.NettyServerBuilder;
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.InstanceHandle;
 import io.quarkus.arc.Subclass;
@@ -299,8 +300,14 @@ private void devModeStart(GrpcContainer grpcContainer, Vertx vertx, GrpcServerCo
     private void applyNettySettings(GrpcServerConfiguration configuration, VertxServerBuilder builder) {
         if (configuration.netty != null) {
             GrpcServerNettyConfig config = configuration.netty;
-            config.keepAliveTime.ifPresent(duration -> builder.nettyBuilder()
-                    .keepAliveTime(duration.toNanos(), TimeUnit.NANOSECONDS));
+            NettyServerBuilder nettyServerBuilder = builder.nettyBuilder();
+
+            config.keepAliveTime.ifPresent(
+                    duration -> nettyServerBuilder.keepAliveTime(duration.toNanos(), TimeUnit.NANOSECONDS));
+
+            config.permitKeepAliveTime.ifPresent(
+                    duration -> nettyServerBuilder.permitKeepAliveTime(duration.toNanos(), TimeUnit.NANOSECONDS));
+            config.permitKeepAliveWithoutCalls.ifPresent(nettyServerBuilder::permitKeepAliveWithoutCalls);
         }
     }
 

diff --git a/...ions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/GrpcServerNettyConfig.java b/...ions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/GrpcServerNettyConfig.java
@@ -17,4 +17,21 @@ public class GrpcServerNettyConfig {
     @ConfigItem
     public Optional<Duration> keepAliveTime;
 
+    /**
+     * Sets a custom permit-keep-alive duration. This configures the most aggressive keep-alive time clients
+     * are permitted to configure.
+     * The server will try to detect clients exceeding this rate and when detected will forcefully close the connection.
+     *
+     * @see #permitKeepAliveWithoutCalls
+     */
+    @ConfigItem
+    public Optional<Duration> permitKeepAliveTime;
+
+    /**
+     * Sets whether to allow clients to send keep-alive HTTP/2 PINGs even if
+     * there are no outstanding RPCs on the connection.
+     */
+    @ConfigItem
+    public Optional<Boolean> permitKeepAliveWithoutCalls;
+
 }