You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2021/11/22 18:12:21 UTC
[ignite-3] branch ignite-15307 updated: Insert bootstrap factory start calls, fix tests
This is an automated email from the ASF dual-hosted git repository.
ptupitsyn pushed a commit to branch ignite-15307
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-15307 by this push:
new 7d15071 Insert bootstrap factory start calls, fix tests
7d15071 is described below
commit 7d150710bc01a913a7940cb4d0cda51f462f546f
Author: Pavel Tupitsyn <pt...@apache.org>
AuthorDate: Mon Nov 22 21:12:12 2021 +0300
Insert bootstrap factory start calls, fix tests
---
.../network/netty/ItConnectionManagerTest.java | 16 +++++++++++----
.../network/recovery/ItRecoveryHandshakeTest.java | 24 +++++++++++++++-------
.../org/apache/ignite/internal/app/IgniteImpl.java | 1 +
3 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/netty/ItConnectionManagerTest.java b/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/netty/ItConnectionManagerTest.java
index 96ca3ff..79a4971 100644
--- a/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/netty/ItConnectionManagerTest.java
+++ b/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/netty/ItConnectionManagerTest.java
@@ -48,6 +48,7 @@ import org.apache.ignite.internal.network.NetworkMessagesFactory;
import org.apache.ignite.internal.network.recovery.RecoveryClientHandshakeManager;
import org.apache.ignite.internal.network.recovery.RecoveryServerHandshakeManager;
import org.apache.ignite.lang.IgniteInternalException;
+import org.apache.ignite.network.NettyBootstrapFactory;
import org.apache.ignite.network.NetworkMessage;
import org.apache.ignite.network.TestMessage;
import org.apache.ignite.network.TestMessageSerializationRegistryImpl;
@@ -76,8 +77,11 @@ public class ItConnectionManagerTest {
* After each.
*/
@AfterEach
- final void tearDown() {
- startedManagers.forEach(ConnectionManager::stop);
+ final void tearDown() throws Exception {
+ for (ConnectionManager startedManager : startedManagers) {
+ startedManager.stop();
+ startedManager.bootstrapFactory().stop();
+ }
}
/**
@@ -330,13 +334,17 @@ public class ItConnectionManagerTest {
networkConfiguration.port().update(port).join();
NetworkView cfg = networkConfiguration.value();
-
+
+ NettyBootstrapFactory bootstrapFactory = new NettyBootstrapFactory(cfg, consistentId);
+ bootstrapFactory.start();
+
var manager = new ConnectionManager(
cfg,
registry,
consistentId,
() -> new RecoveryServerHandshakeManager(launchId, consistentId, messageFactory),
- () -> new RecoveryClientHandshakeManager(launchId, consistentId, messageFactory)
+ () -> new RecoveryClientHandshakeManager(launchId, consistentId, messageFactory),
+ bootstrapFactory
);
manager.start();
diff --git a/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/recovery/ItRecoveryHandshakeTest.java b/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/recovery/ItRecoveryHandshakeTest.java
index f2748a4..4f7c9c5 100644
--- a/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/recovery/ItRecoveryHandshakeTest.java
+++ b/modules/network/src/integrationTest/java/org/apache/ignite/internal/network/recovery/ItRecoveryHandshakeTest.java
@@ -76,8 +76,11 @@ public class ItRecoveryHandshakeTest {
* After each.
*/
@AfterEach
- final void tearDown() {
- startedManagers.forEach(ConnectionManager::stop);
+ final void tearDown() throws Exception {
+ for (ConnectionManager startedManager : startedManagers) {
+ startedManager.stop();
+ startedManager.bootstrapFactory().stop();
+ }
}
/**
@@ -381,7 +384,7 @@ public class ItRecoveryHandshakeTest {
/**
* Starts a {@link ConnectionManager} adding it to the {@link #startedManagers} list.
*
- * @param port Port for the {@link ConnectionManager#server}.
+ * @param port Port for the server.
* @param serverHandshakeFailAt At what stage to fail server handshake.
* @param clientHandshakeFailAt At what stage to fail client handshake.
* @return Connection manager.
@@ -401,14 +404,17 @@ public class ItRecoveryHandshakeTest {
networkConfiguration.port().update(port).join();
NetworkView cfg = networkConfiguration.value();
-
+
+ NettyBootstrapFactory bootstrapFactory = new NettyBootstrapFactory(cfg, consistentId);
+ bootstrapFactory.start();
+
var manager = new ConnectionManager(
cfg,
registry,
consistentId,
() -> new FailingRecoveryServerHandshakeManager(launchId, consistentId, serverHandshakeFailAt, messageFactory),
() -> new FailingRecoveryClientHandshakeManager(launchId, consistentId, clientHandshakeFailAt, messageFactory),
- new NettyBootstrapFactory(cfg, consistentId)
+ bootstrapFactory
);
manager.start();
@@ -435,13 +441,17 @@ public class ItRecoveryHandshakeTest {
networkConfiguration.port().update(port).join();
NetworkView cfg = networkConfiguration.value();
-
+
+ NettyBootstrapFactory bootstrapFactory = new NettyBootstrapFactory(cfg, consistentId);
+ bootstrapFactory.start();
+
var manager = new ConnectionManager(
cfg,
registry,
consistentId,
() -> new RecoveryServerHandshakeManager(launchId, consistentId, messageFactory),
- () -> new RecoveryClientHandshakeManager(launchId, consistentId, messageFactory)
+ () -> new RecoveryClientHandshakeManager(launchId, consistentId, messageFactory),
+ bootstrapFactory
);
manager.start();
diff --git a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
index 44cd526..f93ee54 100644
--- a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
+++ b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
@@ -289,6 +289,7 @@ public class IgniteImpl implements Ignite {
// Start the remaining components.
List<IgniteComponent> otherComponents = List.of(
+ nettyBootstrapFactory,
clusterSvc,
raftMgr,
metaStorageMgr,