This is an automated email from the ASF dual-hosted git repository.

ptupitsyn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new b6af8f650b IGNITE-23067 Java thin: fix heartbeat timeout (#4281)
b6af8f650b is described below

commit b6af8f650bbaa0183d022ccccc008f817cd89af2
Author: Pavel Tupitsyn <[email protected]>
AuthorDate: Mon Aug 26 17:39:35 2024 +0300

    IGNITE-23067 Java thin: fix heartbeat timeout (#4281)
    
    Fix incorrect condition for enabling heartbeat timeout.
---
 .../main/java/org/apache/ignite/internal/client/TcpClientChannel.java   | 2 +-
 .../client/src/test/java/org/apache/ignite/client/HeartbeatTest.java    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/modules/client/src/main/java/org/apache/ignite/internal/client/TcpClientChannel.java
 
b/modules/client/src/main/java/org/apache/ignite/internal/client/TcpClientChannel.java
index d5365aa4b6..0901fa94e4 100644
--- 
a/modules/client/src/main/java/org/apache/ignite/internal/client/TcpClientChannel.java
+++ 
b/modules/client/src/main/java/org/apache/ignite/internal/client/TcpClientChannel.java
@@ -770,7 +770,7 @@ class TcpClientChannel implements ClientChannel, 
ClientMessageHandler, ClientCon
                 if (System.currentTimeMillis() - lastSendMillis > interval) {
                     var fut = serviceAsync(ClientOp.HEARTBEAT, null, null, 
false);
 
-                    if (connectTimeout > 0) {
+                    if (heartbeatTimeout > 0) {
                         fut
                                 .orTimeout(heartbeatTimeout, 
TimeUnit.MILLISECONDS)
                                 .exceptionally(e -> {
diff --git 
a/modules/client/src/test/java/org/apache/ignite/client/HeartbeatTest.java 
b/modules/client/src/test/java/org/apache/ignite/client/HeartbeatTest.java
index 448cdcd2a4..28e9ad9cf4 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/HeartbeatTest.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/HeartbeatTest.java
@@ -98,6 +98,7 @@ public class HeartbeatTest extends BaseIgniteAbstractTest {
                     .reconnectThrottlingPeriod(5000)
                     .reconnectThrottlingRetries(0)
                     .heartbeatInterval(50)
+                    .connectTimeout(0)
                     .loggerFactory(loggerFactory);
 
             try (var ignored = builder.build()) {

Reply via email to