This is an automated email from the ASF dual-hosted git repository.
zstan pushed a commit to branch ignite-3.1.0
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-3.1.0 by this push:
new 466e29ece8f IGNITE-26685 Remove ack configuration from network
configuration (#6750)
466e29ece8f is described below
commit 466e29ece8fdb53a4216c6077d7cd358cc854276
Author: Roman Puchkovskiy <[email protected]>
AuthorDate: Mon Oct 13 17:00:03 2025 +0400
IGNITE-26685 Remove ack configuration from network configuration (#6750)
---
.../internal/network/NettyBootstrapFactory.java | 10 ----------
.../configuration/NetworkConfigurationSchema.java | 4 ----
.../internal/network/netty/ConnectionManager.java | 6 ++----
.../network/netty/InboundRecoveryHandler.java | 8 +++-----
.../MessageAcknowledgement.java} | 22 +++++----------------
.../internal/network/netty/PipelineUtils.java | 7 ++-----
.../recovery/RecoveryAcceptorHandshakeManager.java | 10 ++--------
.../RecoveryInitiatorHandshakeManager.java | 10 ++--------
.../network/DefaultMessagingServiceTest.java | 7 +------
.../network/netty/RecoveryHandshakeTest.java | 11 ++---------
.../RecoveryAcceptorHandshakeManagerTest.java | 8 +-------
.../RecoveryInitiatorHandshakeManagerTest.java | 8 +-------
.../configuration/ignite-snapshot.bin | Bin 5603 -> 5524 bytes
13 files changed, 21 insertions(+), 90 deletions(-)
diff --git
a/modules/network/src/main/java/org/apache/ignite/internal/network/NettyBootstrapFactory.java
b/modules/network/src/main/java/org/apache/ignite/internal/network/NettyBootstrapFactory.java
index 5ff6eda7e93..f2bcff10105 100644
---
a/modules/network/src/main/java/org/apache/ignite/internal/network/NettyBootstrapFactory.java
+++
b/modules/network/src/main/java/org/apache/ignite/internal/network/NettyBootstrapFactory.java
@@ -34,7 +34,6 @@ import java.util.List;
import java.util.concurrent.CompletableFuture;
import org.apache.ignite.internal.manager.ComponentContext;
import org.apache.ignite.internal.manager.IgniteComponent;
-import org.apache.ignite.internal.network.configuration.AckConfiguration;
import org.apache.ignite.internal.network.configuration.InboundView;
import org.apache.ignite.internal.network.configuration.NetworkConfiguration;
import org.apache.ignite.internal.network.configuration.NetworkView;
@@ -140,15 +139,6 @@ public class NettyBootstrapFactory implements
IgniteComponent {
return serverBootstrap;
}
- /**
- * Retrieves the acknowledgment configuration.
- *
- * @return The {@link AckConfiguration} instance representing the
acknowledgment configuration.
- */
- public AckConfiguration ackConfiguration() {
- return networkConfiguration.ackConfigurationSchema();
- }
-
/**
* Returns all event loop groups managed by this factory for which it is
necessary to determine blocked threads.
*/
diff --git
a/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NetworkConfigurationSchema.java
b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NetworkConfigurationSchema.java
index 412ff040607..97ec469c5d6 100644
---
a/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NetworkConfigurationSchema.java
+++
b/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/NetworkConfigurationSchema.java
@@ -83,8 +83,4 @@ public class NetworkConfigurationSchema {
/** File transferring configuration. */
@ConfigValue
public FileTransferConfigurationSchema fileTransfer;
-
- /** Configuration for sending acknowledgement. */
- @ConfigValue
- public AckConfigurationSchema ackConfigurationSchema;
}
diff --git
a/modules/network/src/main/java/org/apache/ignite/internal/network/netty/ConnectionManager.java
b/modules/network/src/main/java/org/apache/ignite/internal/network/netty/ConnectionManager.java
index 84f67ff1017..37b3ceb068c 100644
---
a/modules/network/src/main/java/org/apache/ignite/internal/network/netty/ConnectionManager.java
+++
b/modules/network/src/main/java/org/apache/ignite/internal/network/netty/ConnectionManager.java
@@ -535,8 +535,7 @@ public class ConnectionManager implements
ChannelCreationListener {
clusterIdSupplier,
this,
stopping::get,
- productVersionSource,
- bootstrapFactory.ackConfiguration()
+ productVersionSource
);
}
@@ -560,8 +559,7 @@ public class ConnectionManager implements
ChannelCreationListener {
clusterIdSupplier,
this,
stopping::get,
- productVersionSource,
- bootstrapFactory.ackConfiguration()
+ productVersionSource
);
}
diff --git
a/modules/network/src/main/java/org/apache/ignite/internal/network/netty/InboundRecoveryHandler.java
b/modules/network/src/main/java/org/apache/ignite/internal/network/netty/InboundRecoveryHandler.java
index bccaee74db5..1b412f362f4 100644
---
a/modules/network/src/main/java/org/apache/ignite/internal/network/netty/InboundRecoveryHandler.java
+++
b/modules/network/src/main/java/org/apache/ignite/internal/network/netty/InboundRecoveryHandler.java
@@ -24,7 +24,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.ignite.internal.network.NetworkMessage;
import org.apache.ignite.internal.network.NetworkMessagesFactory;
import org.apache.ignite.internal.network.OutNetworkObject;
-import org.apache.ignite.internal.network.configuration.AckView;
import org.apache.ignite.internal.network.recovery.RecoveryDescriptor;
import
org.apache.ignite.internal.network.recovery.message.AcknowledgementMessage;
@@ -61,13 +60,12 @@ public class InboundRecoveryHandler extends
ChannelInboundHandlerAdapter {
*
* @param descriptor Recovery descriptor.
* @param factory Message factory.
- * @param ackCfg Acknowledgement configuration.
*/
- public InboundRecoveryHandler(RecoveryDescriptor descriptor,
NetworkMessagesFactory factory, AckView ackCfg) {
+ public InboundRecoveryHandler(RecoveryDescriptor descriptor,
NetworkMessagesFactory factory) {
this.descriptor = descriptor;
this.factory = factory;
- this.syncAckThreshold = ackCfg.syncAckThreshold();
- this.postponeAckMillis = ackCfg.postponeAckMillis();
+ this.syncAckThreshold = MessageAcknowledgement.SYNC_ACK_THRESHOLD;
+ this.postponeAckMillis = MessageAcknowledgement.POSTPONE_ACK_MILLIS;
}
/** {@inheritDoc} */
diff --git
a/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/AckConfigurationSchema.java
b/modules/network/src/main/java/org/apache/ignite/internal/network/netty/MessageAcknowledgement.java
similarity index 62%
rename from
modules/network/src/main/java/org/apache/ignite/internal/network/configuration/AckConfigurationSchema.java
rename to
modules/network/src/main/java/org/apache/ignite/internal/network/netty/MessageAcknowledgement.java
index 89fcdea1517..92276f7e459 100644
---
a/modules/network/src/main/java/org/apache/ignite/internal/network/configuration/AckConfigurationSchema.java
+++
b/modules/network/src/main/java/org/apache/ignite/internal/network/netty/MessageAcknowledgement.java
@@ -15,34 +15,22 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.network.configuration;
-
-import org.apache.ignite.configuration.annotation.Config;
-import org.apache.ignite.configuration.annotation.PublicName;
-import org.apache.ignite.configuration.annotation.Value;
-import org.apache.ignite.configuration.validation.Range;
+package org.apache.ignite.internal.network.netty;
/**
- * Configuration schema for acknowledgment settings in the network module.
- * This class defines the configuration properties related to acknowledgment
thresholds and delays.
+ * Constants related to message acknowledgement in the networking module.
*/
-@Config
-public class AckConfigurationSchema {
+class MessageAcknowledgement {
/**
* The threshold for determining when acknowledgements should be sent
synchronously.
* When the number of unacknowledged messages exceeds this value,
* acknowledgements will be sent synchronously to prevent excessive
message buildup.
*/
- @Range(min = 0)
- @Value(hasDefault = true)
- public final long syncAckThreshold = 10_000;
+ static final long SYNC_ACK_THRESHOLD = 10_000;
/**
* Delay in milliseconds before sending acknowledgement batch.
* Allows batching multiple acknowledgements for better network efficiency.
*/
- @Range(min = 0)
- @Value(hasDefault = true)
- @PublicName(legacyNames = "postponeAck")
- public final long postponeAckMillis = 200;
+ static final long POSTPONE_ACK_MILLIS = 200;
}
diff --git
a/modules/network/src/main/java/org/apache/ignite/internal/network/netty/PipelineUtils.java
b/modules/network/src/main/java/org/apache/ignite/internal/network/netty/PipelineUtils.java
index 2a0a4bd18a7..e8670e5c1c5 100644
---
a/modules/network/src/main/java/org/apache/ignite/internal/network/netty/PipelineUtils.java
+++
b/modules/network/src/main/java/org/apache/ignite/internal/network/netty/PipelineUtils.java
@@ -24,7 +24,6 @@ import io.netty.handler.stream.ChunkedWriteHandler;
import java.util.function.Consumer;
import org.apache.ignite.internal.network.NaiveMessageFormat;
import org.apache.ignite.internal.network.NetworkMessagesFactory;
-import org.apache.ignite.internal.network.configuration.AckView;
import org.apache.ignite.internal.network.handshake.HandshakeManager;
import org.apache.ignite.internal.network.recovery.RecoveryDescriptor;
import org.apache.ignite.internal.network.serialization.MessageFormat;
@@ -80,18 +79,16 @@ public class PipelineUtils {
* @param descriptor Recovery descriptor.
* @param messageHandler Message handler.
* @param factory Message factory.
- * @param ackCfg Acknowledgement configuration.
*/
public static void afterHandshake(
ChannelPipeline pipeline,
RecoveryDescriptor descriptor,
MessageHandler messageHandler,
- NetworkMessagesFactory factory,
- AckView ackCfg
+ NetworkMessagesFactory factory
) {
pipeline.addAfter(OutboundEncoder.NAME, OutboundRecoveryHandler.NAME,
new OutboundRecoveryHandler(descriptor));
pipeline.addBefore(
- HandshakeHandler.NAME, InboundRecoveryHandler.NAME, new
InboundRecoveryHandler(descriptor, factory, ackCfg)
+ HandshakeHandler.NAME, InboundRecoveryHandler.NAME, new
InboundRecoveryHandler(descriptor, factory)
);
pipeline.addAfter(HandshakeHandler.NAME, MessageHandler.NAME,
messageHandler);
}
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 1ae8b66e63d..7ea1c37ed62 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
@@ -37,7 +37,6 @@ import org.apache.ignite.internal.network.InternalClusterNode;
import org.apache.ignite.internal.network.NetworkMessage;
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.HandshakeEventLoopSwitcher;
import org.apache.ignite.internal.network.handshake.HandshakeException;
import org.apache.ignite.internal.network.handshake.HandshakeManager;
@@ -103,8 +102,6 @@ public class RecoveryAcceptorHandshakeManager implements
HandshakeManager {
private final IgniteProductVersionSource productVersionSource;
- private final AckConfiguration ackConfiguration;
-
/** Recovery descriptor. */
private RecoveryDescriptor recoveryDescriptor;
@@ -116,7 +113,6 @@ public class RecoveryAcceptorHandshakeManager implements
HandshakeManager {
* @param recoveryDescriptorProvider Recovery descriptor provider.
* @param stopping Defines whether the corresponding connection manager is
stopping.
* @param productVersionSource Source of product version.
- * @param ackConfiguration Acknowledgement configuration.
*/
public RecoveryAcceptorHandshakeManager(
InternalClusterNode localNode,
@@ -127,8 +123,7 @@ public class RecoveryAcceptorHandshakeManager implements
HandshakeManager {
ClusterIdSupplier clusterIdSupplier,
ChannelCreationListener channelCreationListener,
BooleanSupplier stopping,
- IgniteProductVersionSource productVersionSource,
- AckConfiguration ackConfiguration
+ IgniteProductVersionSource productVersionSource
) {
this.localNode = localNode;
this.messageFactory = messageFactory;
@@ -138,7 +133,6 @@ public class RecoveryAcceptorHandshakeManager implements
HandshakeManager {
this.clusterIdSupplier = clusterIdSupplier;
this.stopping = stopping;
this.productVersionSource = productVersionSource;
- this.ackConfiguration = ackConfiguration;
this.handshakeCompleteFuture.whenComplete((nettySender, throwable) -> {
if (throwable != null) {
@@ -381,7 +375,7 @@ public class RecoveryAcceptorHandshakeManager implements
HandshakeManager {
}
private void handshake(RecoveryDescriptor descriptor) {
- PipelineUtils.afterHandshake(ctx.pipeline(), descriptor,
createMessageHandler(), messageFactory, ackConfiguration.value());
+ PipelineUtils.afterHandshake(ctx.pipeline(), descriptor,
createMessageHandler(), messageFactory);
HandshakeFinishMessage response =
messageFactory.handshakeFinishMessage()
.receivedCount(descriptor.receivedCount())
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 19621d3be52..9bbada8adc8 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
@@ -41,7 +41,6 @@ import org.apache.ignite.internal.network.InternalClusterNode;
import org.apache.ignite.internal.network.NetworkMessage;
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.ChannelAlreadyExistsException;
import org.apache.ignite.internal.network.handshake.CriticalHandshakeException;
import org.apache.ignite.internal.network.handshake.HandshakeEventLoopSwitcher;
@@ -100,8 +99,6 @@ public class RecoveryInitiatorHandshakeManager implements
HandshakeManager {
*/
private final CompletableFuture<CompletionStage<NettySender>>
masterHandshakeCompleteFuture = new CompletableFuture<>();
- private final AckConfiguration ackConfiguration;
-
/** Remote node. */
private InternalClusterNode remoteNode;
@@ -124,7 +121,6 @@ public class RecoveryInitiatorHandshakeManager implements
HandshakeManager {
* @param recoveryDescriptorProvider Recovery descriptor provider.
* @param stopping Defines whether the corresponding connection manager is
stopping.
* @param productVersionSource Source of product version.
- * @param ackConfiguration Acknowledgement configuration.
*/
public RecoveryInitiatorHandshakeManager(
InternalClusterNode localNode,
@@ -135,8 +131,7 @@ public class RecoveryInitiatorHandshakeManager implements
HandshakeManager {
ClusterIdSupplier clusterIdSupplier,
ChannelCreationListener channelCreationListener,
BooleanSupplier stopping,
- IgniteProductVersionSource productVersionSource,
- AckConfiguration ackConfiguration
+ IgniteProductVersionSource productVersionSource
) {
this.localNode = localNode;
this.connectionId = connectionId;
@@ -146,7 +141,6 @@ public class RecoveryInitiatorHandshakeManager implements
HandshakeManager {
this.clusterIdSupplier = clusterIdSupplier;
this.stopping = stopping;
this.productVersionSource = productVersionSource;
- this.ackConfiguration = ackConfiguration;
localHandshakeCompleteFuture.whenComplete((nettySender, throwable) -> {
if (throwable != null) {
@@ -480,7 +474,7 @@ public class RecoveryInitiatorHandshakeManager implements
HandshakeManager {
}
private void handshake(RecoveryDescriptor descriptor) {
- PipelineUtils.afterHandshake(ctx.pipeline(), descriptor,
createMessageHandler(), MESSAGE_FACTORY, ackConfiguration.value());
+ PipelineUtils.afterHandshake(ctx.pipeline(), descriptor,
createMessageHandler(), MESSAGE_FACTORY);
HandshakeStartResponseMessage response =
MESSAGE_FACTORY.handshakeStartResponseMessage()
.clientNode(clusterNodeToMessage(localNode))
diff --git
a/modules/network/src/test/java/org/apache/ignite/internal/network/DefaultMessagingServiceTest.java
b/modules/network/src/test/java/org/apache/ignite/internal/network/DefaultMessagingServiceTest.java
index 2282512d776..3d87670c2b2 100644
---
a/modules/network/src/test/java/org/apache/ignite/internal/network/DefaultMessagingServiceTest.java
+++
b/modules/network/src/test/java/org/apache/ignite/internal/network/DefaultMessagingServiceTest.java
@@ -62,7 +62,6 @@ import
org.apache.ignite.internal.configuration.testframework.ConfigurationExten
import
org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
import org.apache.ignite.internal.failure.FailureProcessor;
import org.apache.ignite.internal.manager.ComponentContext;
-import org.apache.ignite.internal.network.configuration.AckConfiguration;
import org.apache.ignite.internal.network.configuration.NetworkConfiguration;
import org.apache.ignite.internal.network.messages.AllTypesMessageImpl;
import org.apache.ignite.internal.network.messages.InstantContainer;
@@ -141,9 +140,6 @@ class DefaultMessagingServiceTest extends
BaseIgniteAbstractTest {
private final UUID clusterId = randomUUID();
- @InjectConfiguration
- private AckConfiguration ackConfiguration;
-
@BeforeEach
void setUp() {
lenient().when(topologyService.getByConsistentId(eq(senderNode.name()))).thenReturn(senderNode);
@@ -672,8 +668,7 @@ class DefaultMessagingServiceTest extends
BaseIgniteAbstractTest {
clusterIdSupplier,
channel -> {},
() -> false,
- new DefaultIgniteProductVersionSource(),
- ackConfiguration
+ new DefaultIgniteProductVersionSource()
) {
@Override
protected void finishHandshake() {
diff --git
a/modules/network/src/test/java/org/apache/ignite/internal/network/netty/RecoveryHandshakeTest.java
b/modules/network/src/test/java/org/apache/ignite/internal/network/netty/RecoveryHandshakeTest.java
index 6e76abdddea..24b755118e7 100644
---
a/modules/network/src/test/java/org/apache/ignite/internal/network/netty/RecoveryHandshakeTest.java
+++
b/modules/network/src/test/java/org/apache/ignite/internal/network/netty/RecoveryHandshakeTest.java
@@ -38,14 +38,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import
org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
-import
org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
import org.apache.ignite.internal.network.ClusterIdSupplier;
import org.apache.ignite.internal.network.ClusterNodeImpl;
import org.apache.ignite.internal.network.ConstantClusterIdSupplier;
import org.apache.ignite.internal.network.NetworkMessage;
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.HandshakeManager;
import
org.apache.ignite.internal.network.handshake.NoOpHandshakeEventLoopSwitcher;
import org.apache.ignite.internal.network.messages.TestMessage;
@@ -103,9 +101,6 @@ public class RecoveryHandshakeTest extends
BaseIgniteAbstractTest {
private final ClusterIdSupplier clusterIdSupplier = new
ConstantClusterIdSupplier(UUID.randomUUID());
- @InjectConfiguration
- private AckConfiguration ackConfiguration;
-
@Test
public void testHandshake() throws Exception {
RecoveryDescriptorProvider initiatorRecovery =
createRecoveryDescriptorProvider();
@@ -774,8 +769,7 @@ public class RecoveryHandshakeTest extends
BaseIgniteAbstractTest {
clusterIdSupplier,
channel -> {},
() -> false,
- new DefaultIgniteProductVersionSource(),
- ackConfiguration
+ new DefaultIgniteProductVersionSource()
);
}
@@ -808,8 +802,7 @@ public class RecoveryHandshakeTest extends
BaseIgniteAbstractTest {
clusterIdSupplier,
channel -> {},
() -> false,
- new DefaultIgniteProductVersionSource(),
- ackConfiguration
+ new DefaultIgniteProductVersionSource()
);
}
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 5d438bd25b7..f15ebf5ac14 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.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.OutNetworkObject;
-import org.apache.ignite.internal.network.configuration.AckConfiguration;
import org.apache.ignite.internal.network.handshake.HandshakeException;
import
org.apache.ignite.internal.network.handshake.NoOpHandshakeEventLoopSwitcher;
import org.apache.ignite.internal.network.netty.ChannelCreationListener;
@@ -108,9 +106,6 @@ class RecoveryAcceptorHandshakeManagerTest extends
HandshakeManagerTest {
private final AtomicBoolean acceptorHandshakeManagerStopping = new
AtomicBoolean(false);
- @InjectConfiguration
- private AckConfiguration ackConfiguration;
-
@BeforeEach
void initMocks() {
lenient().when(context.channel()).thenReturn(channel);
@@ -180,8 +175,7 @@ class RecoveryAcceptorHandshakeManagerTest extends
HandshakeManagerTest {
new ConstantClusterIdSupplier(CORRECT_CLUSTER_ID),
channelCreationListener,
stopping,
- new DefaultIgniteProductVersionSource(),
- ackConfiguration
+ new DefaultIgniteProductVersionSource()
);
manager.onInit(context);
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 a1a797ecaf6..e1285ebaa6b 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,13 +46,11 @@ 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.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.ChannelAlreadyExistsException;
import org.apache.ignite.internal.network.handshake.HandshakeException;
import
org.apache.ignite.internal.network.handshake.NoOpHandshakeEventLoopSwitcher;
@@ -125,9 +123,6 @@ class RecoveryInitiatorHandshakeManagerTest extends
HandshakeManagerTest {
private final AtomicBoolean initiatorHandshakeManagerStopping = new
AtomicBoolean(false);
- @InjectConfiguration
- private AckConfiguration ackConfiguration;
-
@BeforeEach
void initMocks() {
lenient().when(thisContext.channel()).thenReturn(thisChannel);
@@ -194,8 +189,7 @@ class RecoveryInitiatorHandshakeManagerTest extends
HandshakeManagerTest {
new ConstantClusterIdSupplier(CORRECT_CLUSTER_ID),
channelCreationListener,
stopping,
- new DefaultIgniteProductVersionSource(),
- ackConfiguration
+ new DefaultIgniteProductVersionSource()
);
manager.onInit(thisContext);
diff --git
a/modules/runner/src/test/resources/compatibility/configuration/ignite-snapshot.bin
b/modules/runner/src/test/resources/compatibility/configuration/ignite-snapshot.bin
index eec79e91868..9f26d4e8045 100644
Binary files
a/modules/runner/src/test/resources/compatibility/configuration/ignite-snapshot.bin
and
b/modules/runner/src/test/resources/compatibility/configuration/ignite-snapshot.bin
differ
