set grpc timeout only if existing timout is longer

mscheong01 · Nov 29, 2022 · 71aeac2 · 71aeac2
1 parent e5e8610
commit 71aeac2
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/grpc/src/main/java/com/linecorp/armeria/server/grpc/FramedGrpcService.java b/grpc/src/main/java/com/linecorp/armeria/server/grpc/FramedGrpcService.java
@@ -229,11 +229,12 @@ protected HttpResponse doPost(ServiceRequestContext ctx, HttpRequest req) throws
             final String timeoutHeader = req.headers().get(GrpcHeaderNames.GRPC_TIMEOUT);
             if (timeoutHeader != null) {
                 try {
-                    final long timeout = TimeoutHeaderUtil.fromHeaderValue(timeoutHeader);
-                    if (timeout == 0) {
+                    final Duration timeout = Duration.ofNanos(TimeoutHeaderUtil.fromHeaderValue(timeoutHeader));
+                    final long existingTimeoutMillis = ctx.requestTimeoutMillis();
+                    if (timeout.isZero()) {
                         ctx.clearRequestTimeout();
-                    } else {
-                        ctx.setRequestTimeout(TimeoutMode.SET_FROM_NOW, Duration.ofNanos(timeout));
+                    } else if (existingTimeoutMillis == 0 || existingTimeoutMillis > timeout.toMillis()) {
+                        ctx.setRequestTimeout(TimeoutMode.SET_FROM_NOW, timeout);
                     }
                 } catch (IllegalArgumentException e) {
                     final Metadata metadata = new Metadata();