Commit 54b9f16a authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #25150 from bono007

* pr/25150:
  Update copyright of changed file
  Fix defaults for Cassandra's initQueryTimeout and idleTimeout

Closes gh-25150
parents f334b27d acc8f370
/* /*
* 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -270,7 +270,7 @@ public class CassandraProperties { ...@@ -270,7 +270,7 @@ public class CassandraProperties {
* Timeout to use for internal queries that run as part of the initialization * Timeout to use for internal queries that run as part of the initialization
* process, just after a connection is opened. * process, just after a connection is opened.
*/ */
private Duration initQueryTimeout = Duration.ofMillis(500); private Duration initQueryTimeout = Duration.ofSeconds(5);
public Duration getConnectTimeout() { public Duration getConnectTimeout() {
return this.connectTimeout; return this.connectTimeout;
...@@ -360,7 +360,7 @@ public class CassandraProperties { ...@@ -360,7 +360,7 @@ public class CassandraProperties {
/** /**
* Idle timeout before an idle connection is removed. * 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 * Heartbeat interval after which a message is sent on an idle connection to make
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment