You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/08/21 13:52:11 UTC
[10/40] incubator-ignite git commit: # ignite-1265 fix test
# ignite-1265 fix test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7f928dc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7f928dc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7f928dc0
Branch: refs/heads/ignite-1258
Commit: 7f928dc048a9536e5c020b9baebe5637b0fd4ba6
Parents: 7d1a550
Author: sboikov <sb...@gridgain.com>
Authored: Wed Aug 19 15:47:18 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Aug 19 17:30:06 2015 +0300
----------------------------------------------------------------------
.../distributed/dht/GridDhtTxPrepareFuture.java | 52 ++-
.../GridCacheTransformEventSelfTest.java | 2 +
.../IgniteCacheCrossCacheTxFailoverTest.java | 433 +++++++++++++++++++
...idCachePartitionedHitsAndMissesSelfTest.java | 20 +-
4 files changed, 475 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f928dc0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 1539a2a..08d02f2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -295,25 +295,31 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
boolean hasFilters = !F.isEmptyOrNulls(txEntry.filters()) && !F.isAlwaysTrue(txEntry.filters());
if (hasFilters || retVal || txEntry.op() == DELETE || txEntry.op() == TRANSFORM) {
- cached.unswap(retVal);
+ CacheObject val;
- boolean readThrough = (retVal || hasFilters) &&
- cacheCtx.config().isLoadPreviousValue() &&
- !txEntry.skipStore();
+ if (!txEntry.hasValue()) {
+ cached.unswap(retVal);
- CacheObject val = cached.innerGet(
- tx,
- /*swap*/true,
- readThrough,
- /*fail fast*/false,
- /*unmarshal*/true,
- /*metrics*/retVal,
- /*event*/retVal,
- /*tmp*/false,
- null,
- null,
- null,
- null);
+ boolean readThrough = (retVal || hasFilters) &&
+ cacheCtx.config().isLoadPreviousValue() &&
+ !txEntry.skipStore();
+
+ val = cached.innerGet(
+ tx,
+ /*swap*/true,
+ readThrough,
+ /*fail fast*/false,
+ /*unmarshal*/true,
+ /*metrics*/retVal,
+ /*event*/retVal,
+ /*tmp*/false,
+ null,
+ null,
+ null,
+ null);
+ }
+ else
+ val = txEntry.value();
if (retVal || txEntry.op() == TRANSFORM) {
if (!F.isEmpty(txEntry.entryProcessors())) {
@@ -344,12 +350,14 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
txEntry.entryProcessorCalculatedValue(val);
- if (err != null || procRes != null)
- ret.addEntryProcessResult(txEntry.context(), key, null, procRes, err);
- else
- ret.invokeResult(true);
+ if (retVal) {
+ if (err != null || procRes != null)
+ ret.addEntryProcessResult(txEntry.context(), key, null, procRes, err);
+ else
+ ret.invokeResult(true);
+ }
}
- else
+ else if (retVal)
ret.value(cacheCtx, val);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f928dc0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
index 459e015..d05764c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java
@@ -165,6 +165,8 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest {
startGrids(GRID_CNT);
+ awaitPartitionMapExchange();
+
ignites = new Ignite[GRID_CNT];
ids = new UUID[GRID_CNT];
caches = new IgniteCache[GRID_CNT];
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f928dc0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
new file mode 100644
index 0000000..5432e76
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
@@ -0,0 +1,433 @@
+/*
+ * 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.distributed.dht;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.affinity.rendezvous.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.processors.affinity.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.*;
+import org.apache.ignite.testframework.junits.common.*;
+import org.apache.ignite.transactions.*;
+import org.jetbrains.annotations.*;
+
+import javax.cache.*;
+import javax.cache.processor.*;
+import java.io.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import static org.apache.ignite.transactions.TransactionConcurrency.*;
+import static org.apache.ignite.transactions.TransactionIsolation.*;
+
+/**
+ *
+ */
+public class IgniteCacheCrossCacheTxFailoverTest extends GridCommonAbstractTest {
+ /** */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /** */
+ private static final String CACHE1 = "cache1";
+
+ /** */
+ private static final String CACHE2 = "cache2";
+
+ /** */
+ private static final int GRID_CNT = 4;
+
+ /** */
+ private static final int KEY_RANGE = 1000;
+
+ /** */
+ private static final long TEST_TIME = 3 * 60_000;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
+
+ if (gridName.equals(getTestGridName(GRID_CNT - 1)))
+ cfg.setClientMode(true);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ super.beforeTestsStarted();
+
+ startGrids(4);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ super.afterTestsStopped();
+
+ stopAllGrids();
+ }
+
+ /**
+ * @param name Cache name.
+ * @param cacheMode Cache mode.
+ * @param parts Number of partitions.
+ * @return Cache configuration.
+ */
+ private CacheConfiguration cacheConfiguration(String name, CacheMode cacheMode, int parts) {
+ CacheConfiguration ccfg = new CacheConfiguration();
+
+ ccfg.setName(name);
+ ccfg.setCacheMode(cacheMode);
+ ccfg.setAtomicityMode(TRANSACTIONAL);
+ ccfg.setWriteSynchronizationMode(FULL_SYNC);
+
+ if (cacheMode == PARTITIONED)
+ ccfg.setBackups(1);
+
+ ccfg.setAffinity(new RendezvousAffinityFunction(false, parts));
+
+ return ccfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected long getTestTimeout() {
+ return TEST_TIME + 60_000;
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testCrossCachePessimisticTxFailover() throws Exception {
+ crossCacheTxFailover(PARTITIONED, true, PESSIMISTIC, REPEATABLE_READ);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testCrossCachePessimisticTxFailoverDifferentAffinity() throws Exception {
+ crossCacheTxFailover(PARTITIONED, false, PESSIMISTIC, REPEATABLE_READ);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testCrossCacheOptimisticTxFailover() throws Exception {
+ crossCacheTxFailover(PARTITIONED, true, OPTIMISTIC, REPEATABLE_READ);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testCrossCacheOptimisticTxFailoverDifferentAffinity() throws Exception {
+ crossCacheTxFailover(PARTITIONED, false, OPTIMISTIC, REPEATABLE_READ);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testCrossCachePessimisticTxFailoverReplicated() throws Exception {
+ crossCacheTxFailover(REPLICATED, true, PESSIMISTIC, REPEATABLE_READ);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testCrossCacheOptimisticTxFailoverReplicated() throws Exception {
+ crossCacheTxFailover(REPLICATED, true, OPTIMISTIC, REPEATABLE_READ);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testCrossCachePessimisticTxFailoverDifferentAffinityReplicated() throws Exception {
+ crossCacheTxFailover(PARTITIONED, false, PESSIMISTIC, REPEATABLE_READ);
+ }
+
+ /**
+ * @param cacheMode Cache mode.
+ * @param sameAff If {@code false} uses different number of partitions for caches.
+ * @param concurrency Transaction concurrency.
+ * @param isolation Transaction isolation.
+ * @throws Exception If failed.
+ */
+ private void crossCacheTxFailover(CacheMode cacheMode,
+ boolean sameAff,
+ final TransactionConcurrency concurrency,
+ final TransactionIsolation isolation) throws Exception {
+ IgniteKernal ignite0 = (IgniteKernal)ignite(0);
+
+ final AtomicBoolean stop = new AtomicBoolean();
+
+ try {
+ ignite0.createCache(cacheConfiguration(CACHE1, cacheMode, 256));
+ ignite0.createCache(cacheConfiguration(CACHE2, cacheMode, sameAff ? 256 : 128));
+
+ final AtomicInteger threadIdx = new AtomicInteger();
+
+ IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ int idx = threadIdx.getAndIncrement();
+
+ Ignite ignite = ignite(idx % GRID_CNT);
+
+ log.info("Started update thread [node=" + ignite.name() +
+ ", client=" + ignite.configuration().isClientMode() + ']');
+
+ IgniteCache<TestKey, TestValue> cache1 = ignite.cache(CACHE1);
+ IgniteCache<TestKey, TestValue> cache2 = ignite.cache(CACHE2);
+
+ assertNotSame(cache1, cache2);
+
+ IgniteTransactions txs = ignite.transactions();
+
+ ThreadLocalRandom rnd = ThreadLocalRandom.current();
+
+ long iter = 0;
+
+ while (!stop.get()) {
+ boolean sameKey = rnd.nextBoolean();
+
+ try {
+ try (Transaction tx = txs.txStart(concurrency, isolation)) {
+ if (sameKey) {
+ TestKey key = new TestKey(rnd.nextLong(KEY_RANGE));
+
+ cacheOperation(rnd, cache1, key);
+ cacheOperation(rnd, cache2, key);
+ }
+ else {
+ TestKey key1 = new TestKey(rnd.nextLong(KEY_RANGE));
+ TestKey key2 = new TestKey(key1.key() + 1);
+
+ cacheOperation(rnd, cache1, key1);
+ cacheOperation(rnd, cache2, key2);
+ }
+
+ tx.commit();
+ }
+ }
+ catch (CacheException | IgniteException e) {
+ log.info("Update error: " + e);
+ }
+
+ if (iter++ % 500 == 0)
+ log.info("Iteration: " + iter);
+ }
+
+ return null;
+ }
+
+ /**
+ * @param rnd Random.
+ * @param cache Cache.
+ * @param key Key.
+ */
+ private void cacheOperation(ThreadLocalRandom rnd, IgniteCache<TestKey, TestValue> cache, TestKey key) {
+ switch (rnd.nextInt(4)) {
+ case 0:
+ cache.put(key, new TestValue(rnd.nextLong()));
+
+ break;
+
+ case 1:
+ cache.remove(key);
+
+ break;
+
+ case 2:
+ cache.invoke(key, new TestEntryProcessor(rnd.nextBoolean() ? 1L : null));
+
+ break;
+
+ case 3:
+ cache.get(key);
+
+ break;
+
+ default:
+ assert false;
+ }
+ }
+ }, 10, "tx-thread");
+
+ long stopTime = System.currentTimeMillis() + 3 * 60_000;
+
+ long topVer = ignite0.cluster().topologyVersion();
+
+ boolean failed = false;
+
+ while (System.currentTimeMillis() < stopTime) {
+ log.info("Start node.");
+
+ IgniteKernal ignite = (IgniteKernal)startGrid(GRID_CNT);
+
+ assertFalse(ignite.configuration().isClientMode());
+
+ topVer++;
+
+ IgniteInternalFuture<?> affFut = ignite.context().cache().context().exchange().affinityReadyFuture(
+ new AffinityTopologyVersion(topVer));
+
+ try {
+ if (affFut != null)
+ affFut.get(30_000);
+ }
+ catch (IgniteFutureTimeoutCheckedException e) {
+ log.error("Failed to wait for affinity future after start: " + topVer);
+
+ failed = true;
+
+ break;
+ }
+
+ Thread.sleep(500);
+
+ log.info("Stop node.");
+
+ stopGrid(GRID_CNT);
+
+ topVer++;
+
+ affFut = ignite0.context().cache().context().exchange().affinityReadyFuture(
+ new AffinityTopologyVersion(topVer));
+
+ try {
+ if (affFut != null)
+ affFut.get(30_000);
+ }
+ catch (IgniteFutureTimeoutCheckedException e) {
+ log.error("Failed to wait for affinity future after stop: " + topVer);
+
+ failed = true;
+
+ break;
+ }
+ }
+
+ stop.set(true);
+
+ fut.get();
+
+ assertFalse("Test failed, see log for details.", failed);
+ }
+ finally {
+ stop.set(true);
+
+ ignite0.destroyCache(CACHE1);
+ ignite0.destroyCache(CACHE2);
+
+ awaitPartitionMapExchange();
+ }
+ }
+
+ /**
+ *
+ */
+ private static class TestKey implements Serializable {
+ /** */
+ private long key;
+
+ /**
+ * @param key Key.
+ */
+ public TestKey(long key) {
+ this.key = key;
+ }
+
+ /**
+ * @return Key.
+ */
+ public long key() {
+ return key;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ if (this == o)
+ return true;
+
+ if (o == null || getClass() != o.getClass())
+ return false;
+
+ TestKey testKey = (TestKey)o;
+
+ return key == testKey.key;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return (int)(key ^ (key >>> 32));
+ }
+ }
+
+ /**
+ *
+ */
+ private static class TestValue implements Serializable {
+ /** */
+ private long val;
+
+ /**
+ * @param val Value.
+ */
+ public TestValue(long val) {
+ this.val = val;
+ }
+
+ /**
+ * @return Value.
+ */
+ public long value() {
+ return val;
+ }
+ }
+
+ /**
+ *
+ */
+ private static class TestEntryProcessor implements CacheEntryProcessor<TestKey, TestValue, TestValue> {
+ /** */
+ private Long val;
+
+ /**
+ * @param val Value.
+ */
+ public TestEntryProcessor(@Nullable Long val) {
+ this.val = val;
+ }
+
+ /** {@inheritDoc} */
+ @Override public TestValue process(MutableEntry<TestKey, TestValue> e, Object... args) {
+ TestValue old = e.getValue();
+
+ if (val != null)
+ e.setValue(new TestValue(val));
+
+ return old;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f928dc0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
index 6138022..6ceded3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
@@ -32,6 +32,8 @@ import java.util.*;
import static org.apache.ignite.cache.CacheMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import static org.apache.ignite.transactions.TransactionConcurrency.*;
+import static org.apache.ignite.transactions.TransactionIsolation.*;
/**
* Test for issue GG-3997 Total Hits and Misses display wrong value for in-memory database.
@@ -50,18 +52,18 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
- // DiscoverySpi
+ // DiscoverySpi.
TcpDiscoverySpi disco = new TcpDiscoverySpi();
disco.setIpFinder(IP_FINDER);
cfg.setDiscoverySpi(disco);
// Cache.
- cfg.setCacheConfiguration(cacheConfiguration(gridName));
+ cfg.setCacheConfiguration(cacheConfiguration());
TransactionConfiguration tCfg = new TransactionConfiguration();
- tCfg.setDefaultTxConcurrency(TransactionConcurrency.PESSIMISTIC);
- tCfg.setDefaultTxIsolation(TransactionIsolation.REPEATABLE_READ);
+ tCfg.setDefaultTxConcurrency(PESSIMISTIC);
+ tCfg.setDefaultTxIsolation(REPEATABLE_READ);
cfg.setTransactionConfiguration(tCfg);
@@ -71,20 +73,18 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac
/**
* Cache configuration.
*
- * @param gridName Grid name.
* @return Cache configuration.
* @throws Exception In case of error.
*/
- protected CacheConfiguration cacheConfiguration(String gridName) throws Exception {
+ protected CacheConfiguration cacheConfiguration() throws Exception {
CacheConfiguration cfg = defaultCacheConfiguration();
+
cfg.setCacheMode(PARTITIONED);
cfg.setStartSize(700000);
cfg.setWriteSynchronizationMode(FULL_ASYNC);
cfg.setEvictionPolicy(null);
cfg.setBackups(1);
cfg.setNearConfiguration(null);
- cfg.setRebalanceDelay(-1);
- cfg.setBackups(1);
cfg.setStatisticsEnabled(true);
return cfg;
@@ -96,10 +96,10 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
public void testHitsAndMisses() throws Exception {
- assert(GRID_CNT > 0);
-
startGrids(GRID_CNT);
+ awaitPartitionMapExchange();
+
try {
final Ignite g = grid(0);