Repository: ignite Updated Branches: refs/heads/master 3fd9e0419 -> 4026ddcc2
http://git-wip-us.apache.org/repos/asf/ignite/blob/4026ddcc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheGroupsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheGroupsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheGroupsTest.java index 06f1922..0787535 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheGroupsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheGroupsTest.java @@ -49,8 +49,8 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheGroupsTest commitFailed(tx); } - assertEmpty(CACHE_NAME_1); // rolled back - assertEmpty(CACHE_NAME_3); // rolled back + assertEmpty(CACHE_NAME_1); // Rolled back. + assertEmpty(CACHE_NAME_3); // Rolled back. try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { putInvalid(CACHE_NAME_1); @@ -65,7 +65,7 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheGroupsTest putInvalid(CACHE_NAME_1); } - assertEmpty(DEFAULT_CACHE_NAME); // rolled back + assertEmpty(DEFAULT_CACHE_NAME); // Rolled back. startGrid(1); @@ -94,7 +94,7 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheGroupsTest putInvalid(CACHE_NAME_1); } - assertEmpty(CACHE_NAME_3); // rolled back + assertEmpty(CACHE_NAME_3); // Rolled back. try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { putValid(CACHE_NAME_1); @@ -102,8 +102,8 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheGroupsTest commitFailed(tx); } - assertEmpty(CACHE_NAME_1); // rolled back - assertEmpty(CACHE_NAME_3); // rolled back + assertEmpty(CACHE_NAME_1); // Rolled back. + assertEmpty(CACHE_NAME_3); // Rolled back. try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { putValid(DEFAULT_CACHE_NAME); http://git-wip-us.apache.org/repos/asf/ignite/blob/4026ddcc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java index 7949c50..781d88d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorAbstractTxCacheTest.java @@ -20,10 +20,11 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.transactions.Transaction; -import org.apache.ignite.transactions.TransactionConcurrency; -import org.apache.ignite.transactions.TransactionIsolation; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; +import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC; +import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC; +import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ; /** * Topology validator test @@ -41,17 +42,16 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteT /** {@inheritDoc} */ @Override public void testTopologyValidator() throws Exception { - - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.OPTIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { putValid(CACHE_NAME_1); commitFailed(tx); } - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { putInvalid(CACHE_NAME_1); } - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.OPTIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { putValid(CACHE_NAME_1); putValid(DEFAULT_CACHE_NAME); putValid(CACHE_NAME_2); @@ -62,7 +62,7 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteT assertEmpty(CACHE_NAME_1); // rolled back assertEmpty(CACHE_NAME_2); // rolled back - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { putValid(DEFAULT_CACHE_NAME); putInvalid(CACHE_NAME_1); } @@ -72,14 +72,14 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteT startGrid(1); - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.OPTIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { putValid(CACHE_NAME_1); tx.commit(); } remove(CACHE_NAME_1); - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { putValid(CACHE_NAME_1); tx.commit(); } @@ -88,7 +88,7 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteT startGrid(2); - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { putValid(DEFAULT_CACHE_NAME); putInvalid(CACHE_NAME_1); } @@ -96,16 +96,16 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteT assertEmpty(DEFAULT_CACHE_NAME); // rolled back assertEmpty(CACHE_NAME_1); // rolled back - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.OPTIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { putValid(CACHE_NAME_1); commitFailed(tx); } - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { putInvalid(CACHE_NAME_1); } - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.OPTIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(OPTIMISTIC, REPEATABLE_READ)) { putValid(DEFAULT_CACHE_NAME); putValid(CACHE_NAME_2); tx.commit(); @@ -114,7 +114,7 @@ public abstract class IgniteTopologyValidatorAbstractTxCacheTest extends IgniteT remove(DEFAULT_CACHE_NAME); remove(CACHE_NAME_2); - try (Transaction tx = grid(0).transactions().txStart(TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)) { + try (Transaction tx = grid(0).transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) { putValid(DEFAULT_CACHE_NAME); putValid(CACHE_NAME_2); tx.commit(); http://git-wip-us.apache.org/repos/asf/ignite/blob/4026ddcc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java index 20cef30..db3f5cd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java @@ -476,7 +476,7 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { ignite0.cache(CACHE_NAME1); - checkAffinity(nodes, topVer(topVer, 2), true); + checkAffinity(nodes, topVer(topVer, 1), true); topVer++; @@ -486,7 +486,7 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { ignite0.cache(CACHE_NAME1).close(); - checkAffinity(nodes, topVer(topVer, 2), true); + checkAffinity(nodes, topVer(topVer, 1), true); } } @@ -832,11 +832,11 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { assertNotNull(client.cache(CACHE_NAME1)); - checkAffinity(4, topVer(4, 1), false); + checkAffinity(4, topVer(4, 0), false); spi.stopBlock(); - checkAffinity(4, topVer(4, 2), true); + checkAffinity(4, topVer(4, 1), true); } /** @@ -1240,11 +1240,11 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { IgniteCache cache = client.cache(CACHE_NAME1); - checkAffinity(2, topVer(2, 1), true); + checkAffinity(2, topVer(2, 0), true); cache.close(); - checkAffinity(2, topVer(2, 2), true); + checkAffinity(2, topVer(2, 0), true); } /** @@ -1274,11 +1274,11 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest { client.cache(CACHE_NAME2); - checkAffinity(4, topVer(4, 2), true); + checkAffinity(4, topVer(4, 1), true); client.destroyCache(CACHE_NAME2); - checkAffinity(4, topVer(4, 3), true); + checkAffinity(4, topVer(4, 2), true); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/4026ddcc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java index 0885b1a..1f850b2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java @@ -530,26 +530,31 @@ public class IgniteCacheClientNodePartitionsExchangeTest extends GridCommonAbstr else ignite2.cache(CACHE_NAME1); - waitForTopologyUpdate(3, new AffinityTopologyVersion(3, ++minorVer)); - GridCacheAdapter cache = ((IgniteKernal)ignite2).context().cache().context().cache().internalCache(CACHE_NAME1); assertNotNull(cache); assertEquals(nearCache, cache.context().isNear()); assertEquals(0, spi0.partitionsSingleMessages()); - assertEquals(1, spi0.partitionsFullMessages()); + assertEquals(0, spi0.partitionsFullMessages()); assertEquals(0, spi1.partitionsSingleMessages()); assertEquals(0, spi1.partitionsFullMessages()); - assertEquals(1, spi2.partitionsSingleMessages()); + assertEquals(0, spi2.partitionsSingleMessages()); assertEquals(0, spi2.partitionsFullMessages()); - ClusterNode clientNode = ((IgniteKernal)ignite2).localNode(); + final ClusterNode clientNode = ((IgniteKernal)ignite2).localNode(); for (Ignite ignite : Ignition.allGrids()) { - GridDiscoveryManager disco = ((IgniteKernal)ignite).context().discovery(); + final GridDiscoveryManager disco = ((IgniteKernal)ignite).context().discovery(); + + GridTestUtils.waitForCondition(new GridAbsPredicate() { + @Override public boolean apply() { + return disco.cacheNode(clientNode, CACHE_NAME1); + } + }, 5000); assertTrue(disco.cacheNode(clientNode, CACHE_NAME1)); + assertFalse(disco.cacheAffinityNode(clientNode, CACHE_NAME1)); assertEquals(nearCache, disco.cacheNearNode(clientNode, CACHE_NAME1)); } @@ -565,8 +570,6 @@ public class IgniteCacheClientNodePartitionsExchangeTest extends GridCommonAbstr assertNull(((IgniteKernal)ignite2).context().cache().context().cache().internalCache(CACHE_NAME1)); - waitForTopologyUpdate(3, new AffinityTopologyVersion(3, ++minorVer)); - assertEquals(0, spi0.partitionsSingleMessages()); assertEquals(0, spi0.partitionsFullMessages()); assertEquals(0, spi1.partitionsSingleMessages()); @@ -577,9 +580,7 @@ public class IgniteCacheClientNodePartitionsExchangeTest extends GridCommonAbstr final String CACHE_NAME2 = "cache2"; - ccfg = new CacheConfiguration(DEFAULT_CACHE_NAME); - - ccfg.setName(CACHE_NAME2); + ccfg = new CacheConfiguration(CACHE_NAME2); log.info("Create new cache: " + CACHE_NAME2); http://git-wip-us.apache.org/repos/asf/ignite/blob/4026ddcc/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 aea7a2f..58eceaa 100644 --- 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 @@ -115,6 +115,7 @@ import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.FileSystemXmlApplicationContext; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_CLIENT_CACHE_CHANGE_MESSAGE_TIMEOUT; import static org.apache.ignite.IgniteSystemProperties.IGNITE_DISCO_FAILED_CLIENT_RECONNECT_DELAY; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; @@ -193,6 +194,7 @@ public abstract class GridAbstractTest extends TestCase { System.setProperty(IgniteSystemProperties.IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE, "10000"); System.setProperty(IgniteSystemProperties.IGNITE_UPDATE_NOTIFIER, "false"); System.setProperty(IGNITE_DISCO_FAILED_CLIENT_RECONNECT_DELAY, "1"); + System.setProperty(IGNITE_CLIENT_CACHE_CHANGE_MESSAGE_TIMEOUT, "1000"); if (BINARY_MARSHALLER) GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, BinaryMarshaller.class.getName()); http://git-wip-us.apache.org/repos/asf/ignite/blob/4026ddcc/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java index 43f6b13..c69cac6 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java @@ -42,7 +42,9 @@ import org.apache.ignite.internal.processors.cache.IgniteCacheEntryProcessorNode import org.apache.ignite.internal.processors.cache.IgniteCacheIncrementTxTest; import org.apache.ignite.internal.processors.cache.IgniteCacheNoSyncForGetTest; import org.apache.ignite.internal.processors.cache.IgniteCachePartitionMapUpdateTest; +import org.apache.ignite.internal.processors.cache.IgniteClientCacheStartFailoverTest; import org.apache.ignite.internal.processors.cache.IgniteDynamicCacheAndNodeStop; +import org.apache.ignite.internal.processors.cache.IgniteNearClientCacheCloseTest; import org.apache.ignite.internal.processors.cache.IgniteOnePhaseCommitInvokeTest; import org.apache.ignite.internal.processors.cache.IgniteOnePhaseCommitNearReadersTest; import org.apache.ignite.internal.processors.cache.MemoryPolicyConfigValidationTest; @@ -272,6 +274,8 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(IgniteCacheNoSyncForGetTest.class)); suite.addTest(new TestSuite(IgniteOnePhaseCommitNearReadersTest.class)); + suite.addTest(new TestSuite(IgniteNearClientCacheCloseTest.class)); + suite.addTest(new TestSuite(IgniteClientCacheStartFailoverTest.class)); return suite; }
