This is an automated email from the ASF dual-hosted git repository.
ibessonov 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 9f3e028 IGNITE-14717 Wide use of TestScaleCubeClusterServiceFactory.
(#128)
9f3e028 is described below
commit 9f3e0282a17ed21e14e7079f243bb5f7dcd86dba
Author: ibessonov <[email protected]>
AuthorDate: Fri May 14 13:16:41 2021 +0300
IGNITE-14717 Wide use of TestScaleCubeClusterServiceFactory. (#128)
Signed-off-by: ibessonov <[email protected]>
---
modules/metastorage-client/pom.xml | 8 ++++++++
...StorageServiceTest.java => ITMetaStorageServiceTest.java} | 8 ++++----
modules/network/pom.xml | 12 ++++++++++++
.../scalecube/TestScaleCubeClusterServiceFactory.java | 2 ++
modules/raft/pom.xml | 7 +++++++
.../apache/ignite/raft/server/ITRaftCounterServerTest.java | 4 ++--
modules/table/pom.xml | 7 +++++++
.../apache/ignite/distributed/ITDistributedTableTest.java} | 10 +++++-----
parent/pom.xml | 7 +++++++
9 files changed, 54 insertions(+), 11 deletions(-)
diff --git a/modules/metastorage-client/pom.xml
b/modules/metastorage-client/pom.xml
index ccf9ac5..d45bafd 100644
--- a/modules/metastorage-client/pom.xml
+++ b/modules/metastorage-client/pom.xml
@@ -65,6 +65,14 @@
<dependency>
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-raft</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-network</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git
a/modules/metastorage-client/src/integrationTest/java/org/apache/ignite/internal/metastorage/client/MetaStorageServiceTest.java
b/modules/metastorage-client/src/integrationTest/java/org/apache/ignite/internal/metastorage/client/ITMetaStorageServiceTest.java
similarity index 99%
rename from
modules/metastorage-client/src/integrationTest/java/org/apache/ignite/internal/metastorage/client/MetaStorageServiceTest.java
rename to
modules/metastorage-client/src/integrationTest/java/org/apache/ignite/internal/metastorage/client/ITMetaStorageServiceTest.java
index abc275e..f929c29 100644
---
a/modules/metastorage-client/src/integrationTest/java/org/apache/ignite/internal/metastorage/client/MetaStorageServiceTest.java
+++
b/modules/metastorage-client/src/integrationTest/java/org/apache/ignite/internal/metastorage/client/ITMetaStorageServiceTest.java
@@ -48,7 +48,7 @@ import org.apache.ignite.network.ClusterLocalConfiguration;
import org.apache.ignite.network.ClusterService;
import org.apache.ignite.network.ClusterServiceFactory;
import org.apache.ignite.network.message.MessageSerializationRegistry;
-import org.apache.ignite.network.scalecube.ScaleCubeClusterServiceFactory;
+import org.apache.ignite.network.scalecube.TestScaleCubeClusterServiceFactory;
import org.apache.ignite.network.scalecube.message.ScaleCubeMessage;
import
org.apache.ignite.network.scalecube.message.ScaleCubeMessageSerializationFactory;
import org.apache.ignite.raft.client.Peer;
@@ -78,9 +78,9 @@ import static org.mockito.Mockito.verify;
* Meta storage client tests.
*/
@SuppressWarnings("WeakerAccess")
-public class MetaStorageServiceTest {
+public class ITMetaStorageServiceTest {
/** The logger. */
- private static final IgniteLogger LOG =
IgniteLogger.forClass(MetaStorageServiceTest.class);
+ private static final IgniteLogger LOG =
IgniteLogger.forClass(ITMetaStorageServiceTest.class);
/** Base network port. */
private static final int NODE_PORT_BASE = 20_000;
@@ -98,7 +98,7 @@ public class MetaStorageServiceTest {
private static RaftClientMessageFactory FACTORY = new
RaftClientMessageFactoryImpl();
/** Network factory. */
- private static final ClusterServiceFactory NETWORK_FACTORY = new
ScaleCubeClusterServiceFactory();
+ private static final ClusterServiceFactory NETWORK_FACTORY = new
TestScaleCubeClusterServiceFactory();
/** */
private static final MessageSerializationRegistry SERIALIZATION_REGISTRY =
new MessageSerializationRegistry()
diff --git a/modules/network/pom.xml b/modules/network/pom.xml
index 1c3c786..437830f 100644
--- a/modules/network/pom.xml
+++ b/modules/network/pom.xml
@@ -100,6 +100,18 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git
a/modules/network/src/integrationTest/java/org/apache/ignite/network/scalecube/TestScaleCubeClusterServiceFactory.java
b/modules/network/src/integrationTest/java/org/apache/ignite/network/scalecube/TestScaleCubeClusterServiceFactory.java
index 46fc42e..9fa7333 100644
---
a/modules/network/src/integrationTest/java/org/apache/ignite/network/scalecube/TestScaleCubeClusterServiceFactory.java
+++
b/modules/network/src/integrationTest/java/org/apache/ignite/network/scalecube/TestScaleCubeClusterServiceFactory.java
@@ -33,6 +33,8 @@ public class TestScaleCubeClusterServiceFactory extends
ScaleCubeClusterServiceF
// Theoretical upper bound for detection of faulty node by some other
node: 500 * (e / (e - 1)) = 790ms
cfg = cfg.failureDetector(opts ->
opts.pingInterval(500).pingReqMembers(1));
+ cfg = cfg.gossip(opts -> opts.gossipInterval(10));
+
return cfg;
}
}
diff --git a/modules/raft/pom.xml b/modules/raft/pom.xml
index 93e5f9d..707e7ee 100644
--- a/modules/raft/pom.xml
+++ b/modules/raft/pom.xml
@@ -56,6 +56,13 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-network</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git
a/modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/ITRaftCounterServerTest.java
b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/ITRaftCounterServerTest.java
index ecc90b4..176ba07 100644
---
a/modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/ITRaftCounterServerTest.java
+++
b/modules/raft/src/integrationTest/java/org/apache/ignite/raft/server/ITRaftCounterServerTest.java
@@ -24,7 +24,7 @@ import org.apache.ignite.network.ClusterLocalConfiguration;
import org.apache.ignite.network.ClusterService;
import org.apache.ignite.network.ClusterServiceFactory;
import org.apache.ignite.network.message.MessageSerializationRegistry;
-import org.apache.ignite.network.scalecube.ScaleCubeClusterServiceFactory;
+import org.apache.ignite.network.scalecube.TestScaleCubeClusterServiceFactory;
import org.apache.ignite.network.scalecube.message.ScaleCubeMessage;
import
org.apache.ignite.network.scalecube.message.ScaleCubeMessageSerializationFactory;
import org.apache.ignite.raft.client.Peer;
@@ -51,7 +51,7 @@ class ITRaftCounterServerTest {
private static final RaftClientMessageFactory FACTORY = new
RaftClientMessageFactoryImpl();
/** Network factory. */
- private static final ClusterServiceFactory NETWORK_FACTORY = new
ScaleCubeClusterServiceFactory();
+ private static final ClusterServiceFactory NETWORK_FACTORY = new
TestScaleCubeClusterServiceFactory();
/** */
private static final MessageSerializationRegistry SERIALIZATION_REGISTRY =
new MessageSerializationRegistry()
diff --git a/modules/table/pom.xml b/modules/table/pom.xml
index 9051426..a9a22bd 100644
--- a/modules/table/pom.xml
+++ b/modules/table/pom.xml
@@ -95,5 +95,12 @@
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-network</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git
a/modules/table/src/test/java/org/apache/ignite/table/distributed/DistributedTableTest.java
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ITDistributedTableTest.java
similarity index 98%
rename from
modules/table/src/test/java/org/apache/ignite/table/distributed/DistributedTableTest.java
rename to
modules/table/src/integrationTest/java/org/apache/ignite/distributed/ITDistributedTableTest.java
index a7065d3..f2e298c 100644
---
a/modules/table/src/test/java/org/apache/ignite/table/distributed/DistributedTableTest.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/distributed/ITDistributedTableTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.table.distributed;
+package org.apache.ignite.distributed;
import java.util.ArrayList;
import java.util.HashMap;
@@ -45,7 +45,7 @@ import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.network.ClusterService;
import org.apache.ignite.network.ClusterServiceFactory;
import org.apache.ignite.network.message.MessageSerializationRegistry;
-import org.apache.ignite.network.scalecube.ScaleCubeClusterServiceFactory;
+import org.apache.ignite.network.scalecube.TestScaleCubeClusterServiceFactory;
import org.apache.ignite.network.scalecube.message.ScaleCubeMessage;
import
org.apache.ignite.network.scalecube.message.ScaleCubeMessageSerializationFactory;
import org.apache.ignite.raft.client.Peer;
@@ -70,9 +70,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Distributed internal table tests.
*/
-public class DistributedTableTest {
+public class ITDistributedTableTest {
/** The logger. */
- private static final IgniteLogger LOG =
IgniteLogger.forClass(DistributedTableTest.class);
+ private static final IgniteLogger LOG =
IgniteLogger.forClass(ITDistributedTableTest.class);
/** Base network port. */
public static final int NODE_PORT_BASE = 20_000;
@@ -87,7 +87,7 @@ public class DistributedTableTest {
private static RaftClientMessageFactory FACTORY = new
RaftClientMessageFactoryImpl();
/** Network factory. */
- private static final ClusterServiceFactory NETWORK_FACTORY = new
ScaleCubeClusterServiceFactory();
+ private static final ClusterServiceFactory NETWORK_FACTORY = new
TestScaleCubeClusterServiceFactory();
/** */
private static final MessageSerializationRegistry SERIALIZATION_REGISTRY =
new MessageSerializationRegistry()
diff --git a/parent/pom.xml b/parent/pom.xml
index 11b804a..3f037e7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -303,6 +303,13 @@
<!-- Test dependencies -->
<dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-network</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ </dependency>
+
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.jupiter.version}</version>
