Repository: incubator-ignite Updated Branches: refs/heads/ignite-746-1 036b9ba3a -> 216cec3b3
# ignite-746-1 removed timeout for atomic futures Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/216cec3b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/216cec3b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/216cec3b Branch: refs/heads/ignite-746-1 Commit: 216cec3b3087edcfdbf5606a618075857afcdd72 Parents: 036b9ba Author: sboikov <sboi...@gridgain.com> Authored: Thu Apr 16 16:53:46 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Apr 16 16:54:40 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAtomicFuture.java | 7 ----- .../dht/atomic/GridDhtAtomicCache.java | 30 -------------------- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 14 --------- .../dht/atomic/GridNearAtomicUpdateFuture.java | 9 ------ .../ignite/testsuites/IgniteCacheTestSuite.java | 1 - 5 files changed, 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/216cec3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java index 8232e17..35d3ec5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java @@ -39,11 +39,4 @@ public interface GridCacheAtomicFuture<R> extends GridCacheFuture<R> { * @return Future keys. */ public Collection<?> keys(); - - /** - * Checks if timeout occurred. - * - * @param timeout Timeout to check. - */ - public void checkTimeout(long timeout); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/216cec3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index 33faf17..6984238 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -2175,36 +2175,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { } /** - * Checks if future timeout happened. - */ - private void scheduleAtomicFutureRecheck() { - final long timeout = ctx.kernalContext().config().getNetworkTimeout(); - - ctx.time().addTimeoutObject(new GridTimeoutObjectAdapter(timeout * 2) { - @Override public void onTimeout() { - boolean leave = false; - - try { - ctx.gate().enter(); - - leave = true; - - for (GridCacheAtomicFuture fut : ctx.mvcc().atomicFutures()) - fut.checkTimeout(timeout); - } - catch (IllegalStateException ignored) { - if (log.isDebugEnabled()) - log.debug("Will not check pending atomic update futures for timeout (Grid is stopping)."); - } - finally { - if (leave) - ctx.gate().leave(); - } - } - }); - } - - /** * @param entry Entry to check. * @param req Update request. * @param res Update response. If filter evaluation failed, key will be added to failed keys and method http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/216cec3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java index 2b1fa01..f6aa5b6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java @@ -156,20 +156,6 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter<Void> } /** {@inheritDoc} */ - @Override public void checkTimeout(long timeout) { - long mapTime0 = mapTime; - - if (mapTime0 > 0 && U.currentTimeMillis() > mapTime0 + timeout) { - IgniteCheckedException ex = new CacheAtomicUpdateTimeoutCheckedException("Cache update timeout out " + - "(consider increasing networkTimeout configuration property)."); - - updateRes.addFailedKeys(keys, ex); - - onDone(ex); - } - } - - /** {@inheritDoc} */ @Override public boolean trackable() { return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/216cec3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index ac4ae2c2..6ea326c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -271,15 +271,6 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> } /** {@inheritDoc} */ - @Override public void checkTimeout(long timeout) { - long mapTime0 = mapTime; - - if (mapTime0 > 0 && U.currentTimeMillis() > mapTime0 + timeout) - onDone(new CacheAtomicUpdateTimeoutCheckedException("Cache update timeout out " + - "(consider increasing networkTimeout configuration property).")); - } - - /** {@inheritDoc} */ @Override public boolean trackable() { return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/216cec3b/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 e167614..5b066ff 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 @@ -138,7 +138,6 @@ public class IgniteCacheTestSuite extends TestSuite { suite.addTestSuite(GridCacheMissingCommitVersionSelfTest.class); suite.addTestSuite(GridCacheEntrySetIterationPreloadingSelfTest.class); suite.addTestSuite(GridCacheMixedPartitionExchangeSelfTest.class); - suite.addTestSuite(GridCacheAtomicTimeoutSelfTest.class); suite.addTestSuite(GridCacheOffHeapTieredEvictionAtomicSelfTest.class); suite.addTestSuite(GridCacheOffHeapTieredEvictionSelfTest.class); suite.addTestSuite(GridCacheOffHeapTieredAtomicSelfTest.class);
