Repository: ignite Updated Branches: refs/heads/ignite-1090 b56b15cda -> 75f14c7b8
IGNITE-1537 - Disallow near optimistic TX future to complete early. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b6f5b311 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b6f5b311 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b6f5b311 Branch: refs/heads/ignite-1090 Commit: b6f5b311ac20e932fbc7773a519c38b1aed6fa41 Parents: 6f3ef6a Author: Alexey Goncharuk <[email protected]> Authored: Wed Sep 23 15:23:00 2015 -0700 Committer: Alexey Goncharuk <[email protected]> Committed: Wed Sep 23 15:23:00 2015 -0700 ---------------------------------------------------------------------- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../near/GridNearOptimisticTxPrepareFuture.java | 134 +++++++++++------ .../cache/local/GridLocalCacheEntry.java | 6 + .../IgniteCacheCreatePutMultiNodeSelfTest.java | 150 +++++++++++++++++++ .../testsuites/IgniteCacheTestSuite4.java | 2 + 5 files changed, 249 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b6f5b311/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 81cc272..1ed7fd9 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 @@ -423,7 +423,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter U.error(log, "Failed to get result value for cache entry: " + cached, e); } catch (GridCacheEntryRemovedException e) { - assert false : "Got entry removed exception while holding transactional lock on entry: " + e; + assert false : "Got entry removed exception while holding transactional lock on entry [e=" + e + ", cached=" + cached + ']'; } catch (GridCacheFilterFailedException e) { assert false : "Got filter failed exception with fail fast false " + e; http://git-wip-us.apache.org/repos/asf/ignite/blob/b6f5b311/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java index 25028c4..aa5e1cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java @@ -51,6 +51,7 @@ import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.C1; import org.apache.ignite.internal.util.typedef.CI1; import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.P1; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; @@ -71,9 +72,8 @@ import static org.apache.ignite.transactions.TransactionState.PREPARING; */ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAdapter implements GridCacheMvccFuture<IgniteInternalTx> { - /** */ - @GridToStringInclude - private Collection<IgniteTxKey> lockKeys = new GridConcurrentHashSet<>(); + + private KeyLockFuture keyLockFut = new KeyLockFuture(); /** * @param cctx Context. @@ -91,10 +91,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd log.debug("Transaction future received owner changed callback: " + entry); if ((entry.context().isNear() || entry.context().isLocal()) && owner != null && tx.hasWriteKey(entry.txKey())) { - lockKeys.remove(entry.txKey()); - - // This will check for locks. - onDone(); + keyLockFut.onKeyLocked(entry.txKey()); return true; } @@ -178,24 +175,6 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd } } - /** - * @return {@code True} if all locks are owned. - */ - private boolean checkLocks() { - boolean locked = lockKeys.isEmpty(); - - if (locked) { - if (log.isDebugEnabled()) - log.debug("All locks are acquired for near prepare future: " + this); - } - else { - if (log.isDebugEnabled()) - log.debug("Still waiting for locks [fut=" + this + ", keys=" + lockKeys + ']'); - } - - return locked; - } - /** {@inheritDoc} */ @Override public void onResult(UUID nodeId, GridNearTxPrepareResponse res) { if (!isDone()) { @@ -215,8 +194,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd /** {@inheritDoc} */ @Override public boolean onDone(IgniteInternalTx t, Throwable err) { - // If locks were not acquired yet, delay completion. - if (isDone() || (err == null && !checkLocks())) + if (isDone()) return false; this.err.compareAndSet(null, err); @@ -333,7 +311,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd if (invalidCaches != null) { onDone(new IgniteCheckedException("Failed to perform cache operation (cache topology is not valid): " + - invalidCaches.toString())); + invalidCaches)); return; } @@ -458,20 +436,13 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd catch (TransactionTimeoutException | TransactionOptimisticException e) { onError(cctx.localNodeId(), null, e); } - catch (IgniteCheckedException e) { - onDone(e); - } } /** * @param reads Read entries. * @param writes Write entries. - * @throws IgniteCheckedException If failed. */ - private void prepare( - Iterable<IgniteTxEntry> reads, - Iterable<IgniteTxEntry> writes - ) throws IgniteCheckedException { + private void prepare(Iterable<IgniteTxEntry> reads, Iterable<IgniteTxEntry> writes) { AffinityTopologyVersion topVer = tx.topologyVersion(); assert topVer.topologyVersion() > 0; @@ -530,6 +501,10 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd } } + keyLockFut.onAllKeysAdded(); + + add(keyLockFut); + if (isDone()) { if (log.isDebugEnabled()) log.debug("Abandoning (re)map because future is done: " + this); @@ -681,7 +656,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd if (cacheCtx.isNear() || cacheCtx.isLocal()) { if (waitLock && entry.explicitVersion() == null) - lockKeys.add(entry.txKey()); + keyLockFut.addLockKey(entry.txKey()); } if (cur == null || !cur.node().id().equals(primary.id()) || cur.near() != cacheCtx.isNear()) { @@ -725,16 +700,23 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd /** {@inheritDoc} */ @Override public String toString() { - Collection<String> futs = F.viewReadOnly(futures(), new C1<IgniteInternalFuture<?>, String>() { - @Override public String apply(IgniteInternalFuture<?> f) { - return "[node=" + ((MiniFuture)f).node().id() + - ", loc=" + ((MiniFuture)f).node().isLocal() + - ", done=" + f.isDone() + "]"; - } - }); + Collection<String> futs = F.viewReadOnly(futures(), + new C1<IgniteInternalFuture<?>, String>() { + @Override public String apply(IgniteInternalFuture<?> f) { + return "[node=" + ((MiniFuture)f).node().id() + + ", loc=" + ((MiniFuture)f).node().isLocal() + + ", done=" + f.isDone() + "]"; + } + }, + new P1<IgniteInternalFuture<IgniteInternalTx>>() { + @Override public boolean apply(IgniteInternalFuture<IgniteInternalTx> f) { + return f instanceof MiniFuture; + } + }); return S.toString(GridNearOptimisticTxPrepareFuture.class, this, "innerFuts", futs, + "keyLockFut", keyLockFut, "tx", tx, "super", super.toString()); } @@ -892,4 +874,68 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd return S.toString(MiniFuture.class, this, "done", isDone(), "cancelled", isCancelled(), "err", error()); } } + + /** + * Keys lock future. + */ + private class KeyLockFuture extends GridFutureAdapter<IgniteInternalTx> { + /** */ + @GridToStringInclude + private Collection<IgniteTxKey> lockKeys = new GridConcurrentHashSet<>(); + + /** */ + private volatile boolean allKeysAdded; + + /** + * @param key Key to track for locking. + */ + private void addLockKey(IgniteTxKey key) { + assert !allKeysAdded; + + lockKeys.add(key); + } + + /** + * @param key Locked keys. + */ + private void onKeyLocked(IgniteTxKey key) { + lockKeys.remove(key); + + checkLocks(); + } + + /** + * Moves future to the ready state. + */ + private void onAllKeysAdded() { + allKeysAdded = true; + + checkLocks(); + } + + /** + * @return {@code True} if all locks are owned. + */ + private boolean checkLocks() { + boolean locked = lockKeys.isEmpty(); + + if (locked && allKeysAdded) { + if (log.isDebugEnabled()) + log.debug("All locks are acquired for near prepare future: " + this); + + onDone(tx); + } + else { + if (log.isDebugEnabled()) + log.debug("Still waiting for locks [fut=" + this + ", keys=" + lockKeys + ']'); + } + + return locked; + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(KeyLockFuture.class, this, super.toString()); + } + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/b6f5b311/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java index a4f6c92..4289754 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java @@ -26,6 +26,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate; import org.apache.ignite.internal.processors.cache.KeyCacheObject; import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; +import org.apache.ignite.internal.util.typedef.internal.S; import org.jetbrains.annotations.Nullable; import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_LOCKED; @@ -411,4 +412,9 @@ public class GridLocalCacheEntry extends GridCacheMapEntry { @Override protected void offHeapPointer(long valPtr) { this.valPtr = valPtr; } + + /** {@inheritDoc} */ + @Override public synchronized String toString() { + return S.toString(GridLocalCacheEntry.class, this, super.toString()); + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b6f5b311/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java new file mode 100644 index 0000000..1efb98a --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutMultiNodeSelfTest.java @@ -0,0 +1,150 @@ +/* + * 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; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.concurrent.Callable; +import java.util.concurrent.CyclicBarrier; +import java.util.concurrent.atomic.AtomicReferenceArray; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.cache.CacheMode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +/** + * + */ +public class IgniteCacheCreatePutMultiNodeSelfTest extends GridCommonAbstractTest { + /** Grid count. */ + private static final int GRID_CNT = 4; + + /** */ + private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + discoSpi.setIpFinder(ipFinder); + + cfg.setDiscoverySpi(discoSpi); + + OptimizedMarshaller marsh = new OptimizedMarshaller(); + marsh.setRequireSerializable(false); + + cfg.setMarshaller(marsh); + + return cfg; + } + + /** {@inheritDoc} */ + @Override protected long getTestTimeout() { + return 6 * 60 * 1000L; + } + + /** + * @throws Exception If failed. + */ + public void testStartNodes() throws Exception { + try { + Collection<IgniteInternalFuture<?>> futs = new ArrayList<>(GRID_CNT); + int scale = 3; + + final CyclicBarrier barrier = new CyclicBarrier(GRID_CNT * scale); + final AtomicReferenceArray<Exception> err = new AtomicReferenceArray<>(GRID_CNT * scale); + + for (int i = 0; i < GRID_CNT * scale; i++) { + if (i < GRID_CNT) + startGrid(i); + + final int idx = i; + + IgniteInternalFuture<Void> fut = GridTestUtils.runAsync(new Callable<Void>() { + @Override public Void call() throws Exception { + Ignite ignite = ignite(idx % GRID_CNT); + + try { + for (int k = 0; k < 50; k++) { + barrier.await(); + + String cacheName = "cache-" + k; + + IgniteCache<Integer, Integer> cache = getCache(ignite, cacheName); + + for (int i = 0; i < 100; i++) + cache.getAndPut(i, i); + + barrier.await(); + + ignite.destroyCache(cacheName); + } + } + catch (Exception e) { + err.set(idx, e); + } + + return null; + } + }); + + futs.add(fut); + } + + for (IgniteInternalFuture<?> fut : futs) + fut.get(getTestTimeout()); + + info("Errors: " + err); + + for (int i = 0; i < err.length(); i++) { + Exception ex = err.get(i); + + if (ex != null) + throw ex; + } + } + finally { + stopAllGrids(); + } + } + + /** + * @param grid Grid. + * @return Cache. + */ + private IgniteCache<Integer, Integer> getCache(Ignite grid, String cacheName) { + CacheConfiguration<Integer, Integer> ccfg = new CacheConfiguration<>(cacheName); + + ccfg.setCacheMode(CacheMode.PARTITIONED); + ccfg.setAtomicityMode(CacheAtomicityMode.ATOMIC); + ccfg.setBackups(1); + ccfg.setNearConfiguration(null); + + return grid.getOrCreateCache(ccfg); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/b6f5b311/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java index 289da3d..9147ccf 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java @@ -76,6 +76,7 @@ import org.apache.ignite.internal.processors.cache.IgniteStartCacheInTransaction import org.apache.ignite.internal.processors.cache.IgniteSystemCacheOnClientTest; import org.apache.ignite.internal.processors.cache.distributed.CacheAffinityEarlyTest; import org.apache.ignite.internal.processors.cache.distributed.CacheNoValueClassOnServerNodeTest; +import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheCreatePutMultiNodeSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheLockFailoverSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheMultiTxLockSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.IgniteCacheNearReadCommittedTest; @@ -197,6 +198,7 @@ public class IgniteCacheTestSuite4 extends TestSuite { suite.addTestSuite(IgniteDynamicClientCacheStartSelfTest.class); suite.addTestSuite(IgniteDynamicCacheStartNoExchangeTimeoutTest.class); suite.addTestSuite(CacheAffinityEarlyTest.class); + suite.addTestSuite(IgniteCacheCreatePutMultiNodeSelfTest.class); suite.addTestSuite(GridCacheTxLoadFromStoreOnLockSelfTest.class);
