From 4ef82c45ac28ca45467402daf23747ea63afa032 Mon Sep 17 00:00:00 2001 From: bono007 Date: Tue, 9 Feb 2021 11:36:55 -0600 Subject: [PATCH 1/2] Fix defaults for Cassandra's initQueryTimeout and idleTimeout See gh-25150 --- .../boot/autoconfigure/cassandra/CassandraProperties.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraProperties.java index df6a9837465b..4823245f34df 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraProperties.java @@ -270,7 +270,7 @@ public static class Connection { * Timeout to use for internal queries that run as part of the initialization * process, just after a connection is opened. */ - private Duration initQueryTimeout = Duration.ofMillis(500); + private Duration initQueryTimeout = Duration.ofSeconds(5); public Duration getConnectTimeout() { return this.connectTimeout; @@ -360,7 +360,7 @@ public static class Pool { /** * Idle timeout before an idle connection is removed. */ - private Duration idleTimeout = Duration.ofSeconds(120); + private Duration idleTimeout = Duration.ofSeconds(5); /** * Heartbeat interval after which a message is sent on an idle connection to make From acc8f3708b9e148ba13ebc7a823bece66c9ab11b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 10 Feb 2021 09:37:04 +0100 Subject: [PATCH 2/2] Update copyright of changed file See gh-25150 --- .../boot/autoconfigure/cassandra/CassandraProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraProperties.java index 4823245f34df..ff0a6e302234 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.