Repository: incubator-ignite Updated Branches: refs/heads/sprint-1 a8573b48a -> 73bc9d34b
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0354a41b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java new file mode 100644 index 0000000..933d48a --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllLargeBatchSelfTest.java @@ -0,0 +1,301 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache; + +import org.apache.ignite.cache.*; +import org.apache.ignite.cluster.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.cache.distributed.dht.*; +import org.apache.ignite.internal.processors.cache.distributed.near.*; +import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.testframework.junits.common.*; +import org.apache.ignite.transactions.*; + +import java.util.*; + +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CacheMode.*; +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; + +/** + * Tests putAll method with large number of keys. + */ +public class IgnitePutAllLargeBatchSelfTest extends GridCommonAbstractTest { + /** Grid count. */ + private static final int GRID_CNT = 4; + + /** */ + private boolean nearEnabled; + + /** Backups. */ + private int backups = 1; + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + cfg.setCacheConfiguration(cacheConfiguration(gridName)); + + return cfg; + } + + /** + * @param gridName Grid name. + * @return Test cache configuration. + */ + public CacheConfiguration cacheConfiguration(String gridName) { + CacheConfiguration ccfg = defaultCacheConfiguration(); + + ccfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL); + ccfg.setBackups(backups); + ccfg.setDistributionMode(nearEnabled ? NEAR_PARTITIONED : PARTITIONED_ONLY); + ccfg.setCacheMode(PARTITIONED); + + return ccfg; + } + + /** + * @throws Exception If failed. + */ + public void testPutAllPessimisticOneBackupPartitioned() throws Exception { + backups = 1; + + checkPutAll(PESSIMISTIC, false); + } + + /** + * @throws Exception If failed. + */ + public void testPutAllPessimisticOneBackupNear() throws Exception { + backups = 1; + + checkPutAll(PESSIMISTIC, true); + } + + /** + * @throws Exception If failed. + */ + public void testPutAllOptimisticOneBackupPartitioned() throws Exception { + backups = 1; + + checkPutAll(OPTIMISTIC, false); + } + + /** + * @throws Exception If failed. + */ + public void testPutAllOptimisticOneBackupNear() throws Exception { + backups = 1; + + checkPutAll(OPTIMISTIC, true); + } + + /** + * @throws Exception If failed. + */ + public void testPutAllPessimisticTwoBackupsPartitioned() throws Exception { + backups = 2; + + checkPutAll(PESSIMISTIC, false); + } + + /** + * @throws Exception If failed. + */ + public void testPutAllPessimisticTwoBackupsNear() throws Exception { + backups = 2; + + checkPutAll(PESSIMISTIC, true); + } + + /** + * @throws Exception If failed. + */ + public void testPutAllOptimisticTwoBackupsPartitioned() throws Exception { + backups = 2; + + checkPutAll(OPTIMISTIC, false); + } + + /** + * @throws Exception If failed. + */ + public void testPutAllOptimisticTwoBackupsNear() throws Exception { + backups = 2; + + checkPutAll(OPTIMISTIC, true); + } + + /** + * @throws Exception If failed. + */ + private void checkPutAll(IgniteTxConcurrency concurrency, boolean nearEnabled) throws Exception { + this.nearEnabled = nearEnabled; + + startGrids(GRID_CNT); + + awaitPartitionMapExchange(); + + try { + GridCache<Object, Object> cache = grid(0).cache(null); + + int keyCnt = 200; + + for (int i = 0; i < keyCnt; i++) + cache.put(i, i); + + // Create readers if near cache is enabled. + for (int g = 1; g < 2; g++) { + for (int i = 30; i < 70; i++) + grid(g).cache(null).get(i); + } + + info(">>> Starting test tx."); + + try (IgniteTx tx = cache.txStart(concurrency, IgniteTxIsolation.REPEATABLE_READ)) { + Map<Integer, Integer> map = new LinkedHashMap<>(); + + for (int i = 0; i < keyCnt; i++) + map.put(i, i * i); + + cache.getAll(map.keySet()); + + cache.putAll(map); + + tx.commit(); + } + + // Check that no stale transactions left and all locks are released. + for (int g = 0; g < GRID_CNT; g++) { + GridKernal k = (GridKernal)grid(g); + + GridCacheAdapter<Object, Object> cacheAdapter = k.context().cache().internalCache(); + + assertEquals(0, cacheAdapter.context().tm().idMapSize()); + + for (int i = 0; i < keyCnt; i++) { + if (cacheAdapter.isNear()) { + GridDhtCacheEntry<Object, Object> entry = ((GridNearCacheAdapter<Object, Object>)cacheAdapter) + .dht().peekExx(i); + + if (entry != null) { + assertFalse(entry.lockedByAny()); + assertTrue(entry.localCandidates().isEmpty()); + assertTrue(entry.remoteMvccSnapshot().isEmpty()); + } + } + + GridCacheEntryEx<Object, Object> entry = cacheAdapter.peekEx(i); + + if (entry != null) { + assertFalse(entry.lockedByAny()); + assertTrue(entry.localCandidates().isEmpty()); + assertTrue(entry.remoteMvccSnapshot().isEmpty()); + } + } + } + + for (int g = 0; g < GRID_CNT; g++) { + GridCache<Object, Object> checkCache = grid(g).cache(null); + + ClusterNode checkNode = grid(g).localNode(); + + for (int i = 0; i < keyCnt; i++) { + if (checkCache.affinity().isPrimaryOrBackup(checkNode, i)) + assertEquals(i * i, checkCache.peek(i, F.asList(GridCachePeekMode.PARTITIONED_ONLY))); + } + } + } + finally { + stopAllGrids(); + } + } + + /** + * @throws Exception If failed. + */ + public void testPreviousValuePartitionedOneBackup() throws Exception { + backups = 1; + nearEnabled = false; + + checkPreviousValue(); + } + + /** + * @throws Exception If failed. + */ + public void testPreviousValuePartitionedTwoBackups() throws Exception { + backups = 2; + nearEnabled = false; + + checkPreviousValue(); + } + + /** + * @throws Exception If failed. + */ + public void testPreviousValueNearOneBackup() throws Exception { + backups = 1; + nearEnabled = true; + + checkPreviousValue(); + } + + /** + * @throws Exception If failed. + */ + public void testPreviousValueNearTwoBackups() throws Exception { + backups = 2; + nearEnabled = true; + + checkPreviousValue(); + } + + /** + * @throws Exception If failed. + */ + private void checkPreviousValue() throws Exception { + startGrids(GRID_CNT); + + awaitPartitionMapExchange(); + + try { + Map<Integer, Integer> checkMap = new HashMap<>(); + + GridCache<Integer, Integer> cache = grid(0).cache(null); + + for (int r = 0; r < 3; r++) { + for (int i = 0; i < 10; i++) { + info("Put: " + i + ", " + r); + + Integer cachePrev = cache.put(i, r); + + Integer mapPrev = checkMap.put(i, r); + + assertEquals(mapPrev, cachePrev); + } + + info(">>>>>>> Done round: " + r); + } + } + finally { + stopAllGrids(); + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0354a41b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java new file mode 100644 index 0000000..b6119da --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java @@ -0,0 +1,129 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache; + +import org.apache.ignite.cache.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.cache.distributed.dht.*; +import org.apache.ignite.internal.processors.cache.distributed.near.*; +import org.apache.ignite.testframework.junits.common.*; +import org.apache.ignite.transactions.*; + +import static org.apache.ignite.transactions.IgniteTxConcurrency.*; +import static org.apache.ignite.transactions.IgniteTxIsolation.*; + +/** + * Tests . + */ +public class IgnitePutAllUpdateNonPreloadedPartitionSelfTest extends GridCommonAbstractTest { + /** Grid count. */ + private static final int GRID_CNT = 4; + + /** Backups. */ + private int backups = 1; + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + cfg.setCacheConfiguration(cacheConfiguration(gridName)); + + return cfg; + } + + /** + * @param gridName Grid name. + * @return Test cache configuration. + */ + public CacheConfiguration cacheConfiguration(String gridName) { + CacheConfiguration ccfg = defaultCacheConfiguration(); + + ccfg.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL); + ccfg.setBackups(backups); + ccfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); + ccfg.setCacheMode(CacheMode.PARTITIONED); + + ccfg.setPreloadPartitionedDelay(-1); + + return ccfg; + } + + /** + * @throws Exception If failed. + */ + public void testPessimistic() throws Exception { + backups = 2; + + startGrids(GRID_CNT - 1); + + try { + for (int i = 0; i < GRID_CNT - 1; i++) + grid(i).cache(null).forceRepartition().get(); + + startGrid(GRID_CNT - 1); + + GridCache<Object, Object> cache = grid(0).cache(null); + + final int keyCnt = 100; + + try (IgniteTx tx = cache.txStart(OPTIMISTIC, REPEATABLE_READ)) { + for (int k = 0; k < keyCnt; k++) + cache.get(k); + + for (int k = 0; k < keyCnt; k++) + cache.put(k, k); + + tx.commit(); + } + + // Check that no stale transactions left and all locks are released. + for (int g = 0; g < GRID_CNT; g++) { + GridKernal k = (GridKernal)grid(g); + + GridCacheAdapter<Object, Object> cacheAdapter = k.context().cache().internalCache(); + + assertEquals(0, cacheAdapter.context().tm().idMapSize()); + + for (int i = 0; i < keyCnt; i++) { + if (cacheAdapter.isNear()) { + GridDhtCacheEntry<Object, Object> entry = ((GridNearCacheAdapter<Object, Object>)cacheAdapter) + .dht().peekExx(i); + + if (entry != null) { + assertFalse(entry.lockedByAny()); + assertTrue(entry.localCandidates().isEmpty()); + assertTrue(entry.remoteMvccSnapshot().isEmpty()); + } + } + + GridCacheEntryEx<Object, Object> entry = cacheAdapter.peekEx(i); + + if (entry != null) { + assertFalse(entry.lockedByAny()); + assertTrue(entry.localCandidates().isEmpty()); + assertTrue(entry.remoteMvccSnapshot().isEmpty()); + } + } + } + } + finally { + stopAllGrids(); + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0354a41b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java index becab72..7d9cd6b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheEventAbstractTest.java @@ -607,7 +607,7 @@ public abstract class GridCacheEventAbstractTest extends GridCacheAbstractSelfTe */ @SuppressWarnings("unchecked") public void testPutIfAbsentAsyncTx() throws Exception { - IgniteBiTuple[] evts = new IgniteBiTuple[] {F.t(EVT_CACHE_OBJECT_PUT, 2 * gridCnt), F.t(EVT_CACHE_OBJECT_READ, 1)}; + IgniteBiTuple[] evts = new IgniteBiTuple[] {F.t(EVT_CACHE_OBJECT_PUT, 2 * gridCnt)}; runTest(new TestCacheRunnable() { @Override public void run(GridCache<String, Integer> cache) throws IgniteCheckedException { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0354a41b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java index 4d8fee4..46dc326 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest.java @@ -167,8 +167,6 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest ((GridKernal)grid(1)).context().discovery().topologyVersion() + ']'); if (fullFailure) - ignoreMessages(ignoreMessageClasses(), allNodeIds()); - else ignoreMessages(ignoreMessageClasses(), F.asList(grid(1).localNode().id())); final GridEx originatingNodeGrid = grid(originatingNode()); @@ -330,17 +328,32 @@ public abstract class IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest // Should not send any messages. cache.putAll(map); - // Fail the node in the middle of transaction. - info(">>> Stopping primary node " + primaryNode); + IgniteTxProxyImpl txProxy = (IgniteTxProxyImpl)tx; + + IgniteTxEx txEx = txProxy.tx(); + + if (commmit) { + txEx.prepare(); - G.stop(G.ignite(primaryNode.id()).name(), true); + // Fail the node in the middle of transaction. + info(">>> Stopping primary node " + primaryNode); - info(">>> Stopped originating node, finishing transaction: " + primaryNode.id()); + G.stop(Ignition.ignite(primaryNode.id()).name(), true); + + info(">>> Stopped originating node, finishing transaction: " + primaryNode.id()); - if (commmit) tx.commit(); - else + } + else { + // Fail the node in the middle of transaction. + info(">>> Stopping primary node " + primaryNode); + + G.stop(G.ignite(primaryNode.id()).name(), true); + + info(">>> Stopped originating node, finishing transaction: " + primaryNode.id()); + tx.rollback(); + } } boolean txFinished = GridTestUtils.waitForCondition(new GridAbsPredicate() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0354a41b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest.java index c93cb46..1738440 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest.java @@ -34,7 +34,7 @@ public class GridCacheColocatedTxPessimisticOriginatingNodeFailureSelfTest exten IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest { /** {@inheritDoc} */ @Override protected Collection<Class<?>> ignoreMessageClasses() { - return F.asList((Class<?>)GridNearTxFinishRequest.class, GridDhtTxFinishRequest.class); + return F.asList((Class<?>)GridNearTxPrepareRequest.class, GridDhtTxPrepareRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0354a41b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java index 8eac9a3..2f71741 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMetricsSelfTest.java @@ -188,9 +188,9 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { assertEquals(1, g.cache(null).metrics().getCacheMisses()); } else if (g.cache(null).affinity().isBackup(g.cluster().localNode(), key)){ - assertEquals(2, g.cache(null).metrics().getCacheGets()); + assertEquals(1, g.cache(null).metrics().getCacheGets()); assertEquals(1, g.cache(null).metrics().getCacheHits()); - assertEquals(1, g.cache(null).metrics().getCacheMisses()); + assertEquals(0, g.cache(null).metrics().getCacheMisses()); } else { assertEquals(0, g.cache(null).metrics().getCacheGets()); @@ -243,9 +243,9 @@ public class GridCacheNearMetricsSelfTest extends GridCacheAbstractSelfTest { assertEquals(0, g.cache(null).metrics().getCacheMisses()); } else { - assertEquals(2, g.cache(null).metrics().getCacheGets()); + assertEquals(1, g.cache(null).metrics().getCacheGets()); assertEquals(1, g.cache(null).metrics().getCacheHits()); - assertEquals(1, g.cache(null).metrics().getCacheMisses()); + assertEquals(0, g.cache(null).metrics().getCacheMisses()); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0354a41b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java index 79111e9..92c2371 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java @@ -187,7 +187,7 @@ public class GridCacheNearReadersSelfTest extends GridCommonAbstractTest { // Node 1 still has node2 in readers map. assertTrue(e1.readers().contains(n2.id())); - assertNotNull((cache1.put(1, "z1"))); + assertNotNull(cache1.put(1, "z1")); // Node 1 still has node2 in readers map. assertFalse(e1.readers().contains(n2.id())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0354a41b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest.java index b2ff962..a443271 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest.java @@ -34,7 +34,7 @@ public class GridCacheNearTxPessimisticOriginatingNodeFailureSelfTest extends IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest { /** {@inheritDoc} */ @Override protected Collection<Class<?>> ignoreMessageClasses() { - return F.asList((Class<?>)GridNearTxFinishRequest.class, GridDhtTxFinishRequest.class); + return F.asList((Class<?>)GridNearTxPrepareRequest.class, GridDhtTxPrepareRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0354a41b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest.java index b24b5fd..87edfca 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest.java @@ -19,6 +19,9 @@ package org.apache.ignite.internal.processors.cache.distributed.replicated; import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; +import org.apache.ignite.internal.processors.cache.distributed.dht.*; +import org.apache.ignite.internal.processors.cache.distributed.near.*; +import org.apache.ignite.internal.util.typedef.*; import java.util.*; @@ -32,7 +35,7 @@ public class GridCacheReplicatedTxPessimisticOriginatingNodeFailureSelfTest exte IgniteTxPessimisticOriginatingNodeFailureAbstractSelfTest { /** {@inheritDoc} */ @Override protected Collection<Class<?>> ignoreMessageClasses() { - return Collections.<Class<?>>singletonList(GridDistributedTxFinishRequest.class); + return F.asList((Class<?>)GridNearTxPrepareRequest.class, GridDhtTxPrepareRequest.class); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0354a41b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java index 78a212f..87a8a34 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@ -66,6 +66,9 @@ public class IgniteCacheTestSuite extends TestSuite { suite.addTestSuite(IgniteCacheTxLocalInvokeTest.class); suite.addTestSuite(IgniteCrossCacheTxStoreSelfTest.class); + suite.addTestSuite(IgnitePutAllLargeBatchSelfTest.class); + suite.addTestSuite(IgnitePutAllUpdateNonPreloadedPartitionSelfTest.class); + // Affinity tests. suite.addTestSuite(GridCachePartitionFairAffinityNodesSelfTest.class); suite.addTestSuite(GridCacheAffinityBackupsSelfTest.class);
