You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2018/11/20 18:04:42 UTC
[49/50] [abbrv] ignite git commit: IGNITE-9959 Set consistent ID in
tests - Fixes #5046
IGNITE-9959 Set consistent ID in tests - Fixes #5046
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e2778462
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e2778462
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e2778462
Branch: refs/heads/ignite-9720
Commit: e2778462b4be754cd99596184c1da0db6a730aa6
Parents: 296737a
Author: Alexey Platonov <ap...@gmail.com>
Authored: Tue Nov 20 20:36:34 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Nov 20 20:36:34 2018 +0300
----------------------------------------------------------------------
.../jdbc2/JdbcDistributedJoinsQueryTest.java | 4 +++
...tingToWalV2SerializerWithCompactionTest.java | 5 ++++
.../PersistenceBasicCompatibilityTest.java | 5 ++++
.../cache/GridCacheAbstractMetricsSelfTest.java | 6 +++++
...tePdsBinaryMetadataOnClusterRestartTest.java | 4 +--
.../IgniteUidAsConsistentIdMigrationTest.java | 26 ++++++++++++++------
.../db/wal/reader/IgniteWalReaderTest.java | 9 ++++---
...teCacheContinuousQueryNoUnsubscribeTest.java | 5 ++++
.../testframework/junits/GridAbstractTest.java | 20 +++++++++++++++
.../IgniteBinaryObjectFieldsQuerySelfTest.java | 5 ++++
.../db/wal/IgniteWalRecoveryTest.java | 3 +--
...IgniteSqlSkipReducerOnUpdateDmlSelfTest.java | 5 ++++
12 files changed, 81 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e2778462/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
index bcf6159..611a883 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
@@ -307,4 +307,8 @@ public class JdbcDistributedJoinsQueryTest extends GridCommonAbstractTest {
}
}
+ /** {@inheritDoc} */
+ @Override protected void setConsistentId(IgniteConfiguration cfg, String igniteInstanceName) {
+ // No-op.
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e2778462/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java
----------------------------------------------------------------------
diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java
index d4c58f8..ddeee66 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/MigratingToWalV2SerializerWithCompactionTest.java
@@ -243,4 +243,9 @@ public class MigratingToWalV2SerializerWithCompactionTest extends IgnitePersiste
cfg.setDataStorageConfiguration(memCfg);
}
}
+
+ /** {@inheritDoc} */
+ @Override protected void setConsistentId(IgniteConfiguration cfg, String igniteInstanceName) {
+ // No-op.
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e2778462/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java
index f27caa3..12f94df 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/PersistenceBasicCompatibilityTest.java
@@ -377,4 +377,9 @@ public class PersistenceBasicCompatibilityTest extends IgnitePersistenceCompatib
'}';
}
}
+
+ /** {@inheritDoc} */
+ @Override protected void setConsistentId(IgniteConfiguration cfg, String igniteInstanceName) {
+ // No-op.
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e2778462/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
index 3c0f001..3336a4d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
@@ -39,6 +39,7 @@ import org.apache.ignite.cache.CacheEntryProcessor;
import org.apache.ignite.cache.CacheMetrics;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.util.lang.GridAbsPredicateX;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -1351,4 +1352,9 @@ public abstract class GridCacheAbstractMetricsSelfTest extends GridCacheAbstract
assertTrue(cache.localMetrics().getEntryProcessorAverageInvocationTime() > 0.0);
}
+
+ /** {@inheritDoc} */
+ @Override protected void setConsistentId(IgniteConfiguration cfg, String igniteInstanceName) {
+ // No-op.
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e2778462/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
index 9121cca..e7475ce 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
@@ -358,8 +358,8 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
) throws Exception {
String workDir = U.defaultWorkDirectory();
- Path fromFile = Paths.get(workDir, fromWorkDir, "binary_meta", fromConsId, fileName);
- Path toFile = Paths.get(workDir, toWorkDir, "binary_meta", toConsId, fileName);
+ Path fromFile = Paths.get(workDir, fromWorkDir, "binary_meta", U.maskForFileName(fromConsId), fileName);
+ Path toFile = Paths.get(workDir, toWorkDir, "binary_meta", U.maskForFileName(toConsId), fileName);
Files.copy(fromFile, toFile, StandardCopyOption.REPLACE_EXISTING);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e2778462/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/filename/IgniteUidAsConsistentIdMigrationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/filename/IgniteUidAsConsistentIdMigrationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/filename/IgniteUidAsConsistentIdMigrationTest.java
index 6e8ef65..e579038 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/filename/IgniteUidAsConsistentIdMigrationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/filename/IgniteUidAsConsistentIdMigrationTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.persistence.db.filename;
import java.io.File;
import java.io.IOException;
+import java.io.Serializable;
import java.util.Arrays;
import java.util.Set;
import java.util.TreeSet;
@@ -351,13 +352,19 @@ public class IgniteUidAsConsistentIdMigrationTest extends GridCommonAbstractTest
* @return name of storage related subfolders
*/
@NotNull private String genNewStyleSubfolderName(final int nodeIdx, final Ignite ignite) {
- final Object consistentId = ignite.cluster().localNode().consistentId();
+ Serializable userDefinedConsistentID = ignite.configuration().getConsistentId();
- assertTrue("For new style folders consistent ID should be UUID," +
- " but actual class is " + (consistentId == null ? null : consistentId.getClass()),
- consistentId instanceof UUID);
+ if (userDefinedConsistentID != null)
+ return U.maskForFileName(userDefinedConsistentID.toString());
+ else {
+ final Object consistentId = ignite.cluster().localNode().consistentId();
- return PdsConsistentIdProcessor.genNewStyleSubfolderName(nodeIdx, (UUID)consistentId);
+ assertTrue("For new style folders consistent ID should be UUID," +
+ " but actual class is " + (consistentId == null ? null : consistentId.getClass()),
+ consistentId instanceof UUID);
+
+ return PdsConsistentIdProcessor.genNewStyleSubfolderName(nodeIdx, (UUID)consistentId);
+ }
}
/**
@@ -571,9 +578,8 @@ public class IgniteUidAsConsistentIdMigrationTest extends GridCommonAbstractTest
}
/**
- * Test case If there are no matching folders,
- * but the directory contains old-style consistent IDs.
- * Ignite should print out a warning.
+ * Test case If there are no matching folders, but the directory contains old-style consistent IDs. Ignite should
+ * print out a warning.
*
* @throws Exception if failed.
*/
@@ -706,4 +712,8 @@ public class IgniteUidAsConsistentIdMigrationTest extends GridCommonAbstractTest
+ " is expected to exist [" + path + "]", curFolder.exists() && curFolder.isDirectory());
}
+ /** {@inheritDoc} */
+ @Override protected void setConsistentId(IgniteConfiguration cfg, String igniteInstanceName) {
+ // No-op.
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e2778462/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
index beab138..85c1326 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
@@ -209,9 +209,7 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
ignite0.cluster().active(true);
- Serializable consistentId = (Serializable)ignite0.cluster().localNode().consistentId();
-
- String subfolderName = genNewStyleSubfolderName(0, (UUID)consistentId);
+ String subfolderName = genDbSubfolderName(ignite0, 0);
int cacheObjectsToWrite = 10_000;
@@ -540,7 +538,10 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
* @return folder file name.
*/
@NotNull private String genDbSubfolderName(Ignite ignite, int nodeIdx) {
- return genNewStyleSubfolderName(nodeIdx, (UUID)ignite.cluster().localNode().consistentId());
+ if (ignite.configuration().getConsistentId() != null)
+ return U.maskForFileName(ignite.cluster().localNode().consistentId().toString());
+ else
+ return genNewStyleSubfolderName(nodeIdx, (UUID)ignite.cluster().localNode().consistentId());
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/e2778462/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java
index d683346..b0f22c5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/IgniteCacheContinuousQueryNoUnsubscribeTest.java
@@ -152,4 +152,9 @@ public class IgniteCacheContinuousQueryNoUnsubscribeTest extends GridCommonAbstr
return true;
}
}
+
+ /** {@inheritDoc} */
+ @Override protected void setConsistentId(IgniteConfiguration cfg, String igniteInstanceName) {
+ // No-op.
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e2778462/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 817c56b..4ddc155 100755
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -908,6 +908,9 @@ public abstract class GridAbstractTest extends TestCase {
*/
protected Ignite startGrid(String igniteInstanceName, IgniteConfiguration cfg, GridSpringResourceContext ctx)
throws Exception {
+
+ setConsistentId(cfg, igniteInstanceName);
+
if (!isRemoteJvm(igniteInstanceName)) {
IgniteUtils.setCurrentIgniteName(igniteInstanceName);
@@ -953,6 +956,20 @@ public abstract class GridAbstractTest extends TestCase {
}
/**
+ * @param cfg Configuration.
+ * @param igniteInstanceName Ignite instance name.
+ */
+ protected void setConsistentId(IgniteConfiguration cfg, String igniteInstanceName) {
+ if (cfg.getConsistentId() == null) {
+ String seed = igniteInstanceName != null ? igniteInstanceName : getClass().getName();
+
+ UUID uuid = UUID.nameUUIDFromBytes(seed.getBytes());
+
+ cfg.setConsistentId(uuid);
+ }
+ }
+
+ /**
* Starts new grid at another JVM with given name.
*
* @param igniteInstanceName Ignite instance name.
@@ -982,6 +999,7 @@ public abstract class GridAbstractTest extends TestCase {
IgniteConfiguration cfg = F.first(cfgMap.get1());
cfg.setIgniteInstanceName(gridName);
+ cfg.setConsistentId(gridName);
cfg.setClientMode(client);
return IgnitionEx.start(cfg, cfgMap.getValue());
@@ -1048,6 +1066,8 @@ public abstract class GridAbstractTest extends TestCase {
if (cfg == null)
cfg = optimize(getConfiguration(igniteInstanceName));
+ setConsistentId(cfg, igniteInstanceName);
+
if (locNode != null) {
DiscoverySpi discoverySpi = locNode.configuration().getDiscoverySpi();
http://git-wip-us.apache.org/repos/asf/ignite/blob/e2778462/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
index 21e4852..00a9e4c 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
@@ -297,4 +297,9 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends GridCommonAbstractTes
return key.<Integer>field("id") <= maxId;
}
}
+
+ /** {@inheritDoc} */
+ @Override protected void setConsistentId(IgniteConfiguration cfg, String igniteInstanceName) {
+ // No-op.
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e2778462/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
index e0703a5..e4744e3 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
@@ -736,8 +736,7 @@ public class IgniteWalRecoveryTest extends GridCommonAbstractTest {
* @throws IgniteCheckedException If fail.
*/
private File cacheDir(final String cacheName, final String consId) throws IgniteCheckedException {
- final String subfolderName
- = PdsConsistentIdProcessor.genNewStyleSubfolderName(0, UUID.fromString(consId));
+ final String subfolderName = U.maskForFileName(consId);
final File dbDir = U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/e2778462/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java
index 0a41d94..6e7ca1b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java
@@ -748,4 +748,9 @@ public class IgniteSqlSkipReducerOnUpdateDmlSelfTest extends GridCommonAbstractT
return rate - 1;
}
+
+ /** {@inheritDoc} */
+ @Override protected void setConsistentId(IgniteConfiguration cfg, String igniteInstanceName) {
+ // No-op.
+ }
}