Skip to content

Commit bdd82e3

Browse files
committed
Align default keepAlive with gRPC defaults
This changes: * default keepAliveTime on server to 2 hours (to align with gRPC default) * default keepAliveTime on client to 5 minutes to align with default permitKeepAliveTime on server (cannot be lower)
1 parent ed6a0e5 commit bdd82e3

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

grpc-client-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/client/config/GrpcChannelProperties.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import io.grpc.NameResolverProvider;
3838
import io.grpc.internal.GrpcUtil;
3939
import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
40-
import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder;
4140
import io.grpc.netty.shaded.io.netty.handler.ssl.SslContextBuilder;
4241
import lombok.EqualsAndHashCode;
4342
import lombok.ToString;
@@ -177,7 +176,7 @@ public void setEnableKeepAlive(final Boolean enableKeepAlive) {
177176

178177
@DurationUnit(ChronoUnit.SECONDS)
179178
private Duration keepAliveTime;
180-
private static final Duration DEFAULT_KEEP_ALIVE_TIME = Duration.of(60, ChronoUnit.SECONDS);
179+
private static final Duration DEFAULT_KEEP_ALIVE_TIME = Duration.of(5, ChronoUnit.MINUTES);
181180

182181
/**
183182
* Gets the default delay before we send a keepAlive.
@@ -191,13 +190,14 @@ public Duration getKeepAliveTime() {
191190
}
192191

193192
/**
194-
* The default delay before we send a keepAlives. Defaults to {@code 60s}. Default unit {@link ChronoUnit#SECONDS
195-
* SECONDS}. Please note that shorter intervals increase the network burden for the server.
193+
* The default delay before we send a keepAlives. Defaults to {@code 5min}. Default unit {@link ChronoUnit#SECONDS
194+
* SECONDS}. Please note that shorter intervals increase the network burden for the server. Cannot be lower than
195+
* permitKeepAliveTime on server (default 5min).
196196
*
197197
* @param keepAliveTime The new default delay before sending keepAlives, or null to use the fallback.
198198
*
199199
* @see #setEnableKeepAlive(Boolean)
200-
* @see NettyServerBuilder#keepAliveTime(long, TimeUnit)
200+
* @see NettyChannelBuilder#keepAliveTime(long, TimeUnit)
201201
*/
202202
public void setKeepAliveTime(final Duration keepAliveTime) {
203203
this.keepAliveTime = keepAliveTime;
@@ -227,7 +227,7 @@ public Duration getKeepAliveTimeout() {
227227
* @param keepAliveTimeout The default timeout for a keepAlives ping request.
228228
*
229229
* @see #setEnableKeepAlive(Boolean)
230-
* @see NettyServerBuilder#keepAliveTimeout(long, TimeUnit)
230+
* @see NettyChannelBuilder#keepAliveTimeout(long, TimeUnit)
231231
*/
232232
public void setKeepAliveTimeout(final Duration keepAliveTimeout) {
233233
this.keepAliveTimeout = keepAliveTimeout;

grpc-server-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/server/config/GrpcServerProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public class GrpcServerProperties {
113113
private boolean enableKeepAlive = false;
114114

115115
/**
116-
* The default delay before we send a keepAlives. Defaults to {@code 60s}. Default unit {@link ChronoUnit#SECONDS
116+
* The default delay before we send a keepAlives. Defaults to {@code 2h}. Default unit {@link ChronoUnit#SECONDS
117117
* SECONDS}.
118118
*
119119
* @see #setEnableKeepAlive(boolean)
@@ -123,7 +123,7 @@ public class GrpcServerProperties {
123123
* @return The default delay before sending keepAlives.
124124
*/
125125
@DurationUnit(ChronoUnit.SECONDS)
126-
private Duration keepAliveTime = Duration.of(60, ChronoUnit.SECONDS);
126+
private Duration keepAliveTime = Duration.of(2, ChronoUnit.HOURS);
127127

128128
/**
129129
* The default timeout for a keepAlives ping request. Defaults to {@code 20s}. Default unit

0 commit comments

Comments
 (0)