This is an automated email from the ASF dual-hosted git repository.
rpuch 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 7e93ad205c7 IGNITE-26601 Throw RecipientLeftException if other side
rejects handshake due to stopping (#6694)
7e93ad205c7 is described below
commit 7e93ad205c72dc892e2eb55750d2c6a8182eabcd
Author: Roman Puchkovskiy <[email protected]>
AuthorDate: Fri Oct 3 19:43:25 2025 +0400
IGNITE-26601 Throw RecipientLeftException if other side rejects handshake
due to stopping (#6694)
---
.../network/recovery/HandshakeManagerUtils.java | 8 ++++
.../recovery/RecoveryAcceptorHandshakeManager.java | 4 +-
.../RecoveryInitiatorHandshakeManager.java | 2 +-
.../network/recovery/HandshakeManagerTest.java | 55 ++++++++++++++++++++++
.../RecoveryAcceptorHandshakeManagerTest.java | 17 ++++---
.../RecoveryInitiatorHandshakeManagerTest.java | 14 +++---
6 files changed, 81 insertions(+), 19 deletions(-)
diff --git
a/modules/network/src/main/java/org/apache/ignite/internal/network/recovery/HandshakeManagerUtils.java
b/modules/network/src/main/java/org/apache/ignite/internal/network/recovery/HandshakeManagerUtils.java
index a48226f5d18..5fc3fec98a6 100644
---
a/modules/network/src/main/java/org/apache/ignite/internal/network/recovery/HandshakeManagerUtils.java
+++
b/modules/network/src/main/java/org/apache/ignite/internal/network/recovery/HandshakeManagerUtils.java
@@ -28,6 +28,8 @@ import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.network.InternalClusterNode;
import org.apache.ignite.internal.network.NetworkMessagesFactory;
import org.apache.ignite.internal.network.OutNetworkObject;
+import org.apache.ignite.internal.network.RecipientLeftException;
+import org.apache.ignite.internal.network.handshake.HandshakeException;
import org.apache.ignite.internal.network.message.ClusterNodeMessage;
import org.apache.ignite.internal.network.netty.NettySender;
import org.apache.ignite.internal.network.netty.NettyUtils;
@@ -84,4 +86,10 @@ class HandshakeManagerUtils {
.port(node.address().port())
.build();
}
+
+ static Exception
createExceptionFromRejectionMessage(HandshakeRejectedMessage msg) {
+ return msg.reason() == HandshakeRejectionReason.STOPPING
+ ? new RecipientLeftException(msg.message())
+ : new HandshakeException(msg.message());
+ }
}
diff --git
a/modules/network/src/main/java/org/apache/ignite/internal/network/recovery/RecoveryAcceptorHandshakeManager.java
b/modules/network/src/main/java/org/apache/ignite/internal/network/recovery/RecoveryAcceptorHandshakeManager.java
index b20f4be8247..1ae8b66e63d 100644
---
a/modules/network/src/main/java/org/apache/ignite/internal/network/recovery/RecoveryAcceptorHandshakeManager.java
+++
b/modules/network/src/main/java/org/apache/ignite/internal/network/recovery/RecoveryAcceptorHandshakeManager.java
@@ -361,9 +361,7 @@ public class RecoveryAcceptorHandshakeManager implements
HandshakeManager {
LOG.debug("Handshake rejected by initiator: {}", msg.message());
}
- HandshakeException err = new HandshakeException(msg.message());
-
- handshakeCompleteFuture.completeExceptionally(err);
+
handshakeCompleteFuture.completeExceptionally(HandshakeManagerUtils.createExceptionFromRejectionMessage(msg));
}
private void rejectHandshakeDueToLosingClinch(RecoveryDescriptor
descriptor) {
diff --git
a/modules/network/src/main/java/org/apache/ignite/internal/network/recovery/RecoveryInitiatorHandshakeManager.java
b/modules/network/src/main/java/org/apache/ignite/internal/network/recovery/RecoveryInitiatorHandshakeManager.java
index a2ef3256d92..19621d3be52 100644
---
a/modules/network/src/main/java/org/apache/ignite/internal/network/recovery/RecoveryInitiatorHandshakeManager.java
+++
b/modules/network/src/main/java/org/apache/ignite/internal/network/recovery/RecoveryInitiatorHandshakeManager.java
@@ -438,7 +438,7 @@ public class RecoveryInitiatorHandshakeManager implements
HandshakeManager {
if (msg.reason() == HandshakeRejectionReason.CLINCH) {
giveUpClinch();
} else {
- localHandshakeCompleteFuture.completeExceptionally(new
HandshakeException(msg.message()));
+
localHandshakeCompleteFuture.completeExceptionally(HandshakeManagerUtils.createExceptionFromRejectionMessage(msg));
}
}
diff --git
a/modules/network/src/test/java/org/apache/ignite/internal/network/recovery/HandshakeManagerTest.java
b/modules/network/src/test/java/org/apache/ignite/internal/network/recovery/HandshakeManagerTest.java
new file mode 100644
index 00000000000..4426dd53134
--- /dev/null
+++
b/modules/network/src/test/java/org/apache/ignite/internal/network/recovery/HandshakeManagerTest.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.network.recovery;
+
+import static
org.apache.ignite.internal.testframework.asserts.CompletableFutureAssert.assertWillThrowFast;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import
org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
+import org.apache.ignite.internal.network.NetworkMessagesFactory;
+import org.apache.ignite.internal.network.RecipientLeftException;
+import org.apache.ignite.internal.network.handshake.HandshakeManager;
+import org.apache.ignite.internal.network.netty.NettySender;
+import
org.apache.ignite.internal.network.recovery.message.HandshakeRejectedMessage;
+import
org.apache.ignite.internal.network.recovery.message.HandshakeRejectionReason;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith({MockitoExtension.class, ConfigurationExtension.class})
+abstract class HandshakeManagerTest extends BaseIgniteAbstractTest {
+ protected static final NetworkMessagesFactory MESSAGE_FACTORY = new
NetworkMessagesFactory();
+
+ protected static void
assertThatRejectionWithStoppingCausesRecipientLeftException(HandshakeManager
manager) {
+ CompletableFuture<NettySender> localHandshakeFuture =
manager.localHandshakeFuture();
+ CompletionStage<NettySender> finalHandshakeFuture =
manager.finalHandshakeFuture();
+
+
manager.onMessage(handshakeRejectedMessageWithReason(HandshakeRejectionReason.STOPPING));
+
+ assertWillThrowFast(localHandshakeFuture,
RecipientLeftException.class);
+ assertWillThrowFast(finalHandshakeFuture.toCompletableFuture(),
RecipientLeftException.class);
+ }
+
+ private static HandshakeRejectedMessage
handshakeRejectedMessageWithReason(HandshakeRejectionReason reason) {
+ return MESSAGE_FACTORY.handshakeRejectedMessage()
+ .message("Rejected")
+ .reasonString(reason.toString())
+ .build();
+ }
+}
diff --git
a/modules/network/src/test/java/org/apache/ignite/internal/network/recovery/RecoveryAcceptorHandshakeManagerTest.java
b/modules/network/src/test/java/org/apache/ignite/internal/network/recovery/RecoveryAcceptorHandshakeManagerTest.java
index 52a32a9bd9d..5d438bd25b7 100644
---
a/modules/network/src/test/java/org/apache/ignite/internal/network/recovery/RecoveryAcceptorHandshakeManagerTest.java
+++
b/modules/network/src/test/java/org/apache/ignite/internal/network/recovery/RecoveryAcceptorHandshakeManagerTest.java
@@ -45,12 +45,10 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.BooleanSupplier;
-import
org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
import
org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
import org.apache.ignite.internal.lang.NodeStoppingException;
import org.apache.ignite.internal.network.ClusterNodeImpl;
import org.apache.ignite.internal.network.ConstantClusterIdSupplier;
-import org.apache.ignite.internal.network.NetworkMessagesFactory;
import org.apache.ignite.internal.network.OutNetworkObject;
import org.apache.ignite.internal.network.configuration.AckConfiguration;
import org.apache.ignite.internal.network.handshake.HandshakeException;
@@ -60,20 +58,16 @@ import org.apache.ignite.internal.network.netty.NettySender;
import
org.apache.ignite.internal.network.recovery.message.HandshakeRejectedMessage;
import
org.apache.ignite.internal.network.recovery.message.HandshakeRejectionReason;
import
org.apache.ignite.internal.network.recovery.message.HandshakeStartResponseMessage;
-import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.version.DefaultIgniteProductVersionSource;
import org.apache.ignite.network.NetworkAddress;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
-import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-@ExtendWith({MockitoExtension.class, ConfigurationExtension.class})
-class RecoveryAcceptorHandshakeManagerTest extends BaseIgniteAbstractTest {
+class RecoveryAcceptorHandshakeManagerTest extends HandshakeManagerTest {
private static final UUID LOWER_ID = new UUID(1, 1);
private static final UUID HIGHER_ID = new UUID(2, 2);
@@ -87,8 +81,6 @@ class RecoveryAcceptorHandshakeManagerTest extends
BaseIgniteAbstractTest {
private static final int PORT = 1000;
- private static final NetworkMessagesFactory MESSAGE_FACTORY = new
NetworkMessagesFactory();
-
private static final UUID CORRECT_CLUSTER_ID = new UUID(11, 12);
@Mock
@@ -254,4 +246,11 @@ class RecoveryAcceptorHandshakeManagerTest extends
BaseIgniteAbstractTest {
assertThat(recoveryDescriptor.holder(), is(nullValue()));
}
+
+ @Test
+ void
gettingHandshakeRejectedMessageWithReasonStoppingCausesHandshakeToBeFinishedWithRecipientLeftException()
{
+ RecoveryAcceptorHandshakeManager manager =
acceptorHandshakeManager(LOWER_ID);
+
+ assertThatRejectionWithStoppingCausesRecipientLeftException(manager);
+ }
}
diff --git
a/modules/network/src/test/java/org/apache/ignite/internal/network/recovery/RecoveryInitiatorHandshakeManagerTest.java
b/modules/network/src/test/java/org/apache/ignite/internal/network/recovery/RecoveryInitiatorHandshakeManagerTest.java
index 86925c94dd7..a1a797ecaf6 100644
---
a/modules/network/src/test/java/org/apache/ignite/internal/network/recovery/RecoveryInitiatorHandshakeManagerTest.java
+++
b/modules/network/src/test/java/org/apache/ignite/internal/network/recovery/RecoveryInitiatorHandshakeManagerTest.java
@@ -46,7 +46,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.BooleanSupplier;
-import
org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
import
org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
import org.apache.ignite.internal.lang.NodeStoppingException;
import org.apache.ignite.internal.network.ClusterNodeImpl;
@@ -63,23 +62,19 @@ import
org.apache.ignite.internal.network.recovery.message.HandshakeRejectedMess
import
org.apache.ignite.internal.network.recovery.message.HandshakeRejectionReason;
import
org.apache.ignite.internal.network.recovery.message.HandshakeStartMessage;
import org.apache.ignite.internal.properties.IgniteProductVersion;
-import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.version.DefaultIgniteProductVersionSource;
import org.apache.ignite.network.NetworkAddress;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
-import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-@ExtendWith({MockitoExtension.class, ConfigurationExtension.class})
@Timeout(10)
-class RecoveryInitiatorHandshakeManagerTest extends BaseIgniteAbstractTest {
+class RecoveryInitiatorHandshakeManagerTest extends HandshakeManagerTest {
private static final UUID LOWER_ID = new UUID(1, 1);
private static final UUID HIGHER_ID = new UUID(2, 2);
@@ -334,4 +329,11 @@ class RecoveryInitiatorHandshakeManagerTest extends
BaseIgniteAbstractTest {
assertThat(recoveryDescriptor.holder(), is(nullValue()));
}
+
+ @Test
+ void
gettingHandshakeRejectedMessageWithReasonStoppingCausesHandshakeToBeFinishedWithRecipientLeftException()
{
+ RecoveryInitiatorHandshakeManager manager =
initiatorHandshakeManager(LOWER_ID);
+
+ assertThatRejectionWithStoppingCausesRecipientLeftException(manager);
+ }
}
