Repository: ignite Updated Branches: refs/heads/ignite-1537 7dbc25ab1 -> 242887107
ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/24288710 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/24288710 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/24288710 Branch: refs/heads/ignite-1537 Commit: 242887107a9b459a6e1d798037edb9735074d423 Parents: 7dbc25a Author: sboikov <sboi...@gridgain.com> Authored: Tue Dec 15 13:08:12 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Dec 15 13:08:12 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheSerializableTransactionsTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/24288710/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java index ae64bb4..f4533f2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java @@ -2981,6 +2981,8 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { IgniteInternalFuture<?> restartFut = restart ? restartFuture(stop, null) : null; + final long stopTime = U.currentTimeMillis() + getTestTimeout() - 30_000; + for (int i = 0; i < 30; i++) { final AtomicInteger cntr = new AtomicInteger(); @@ -3007,6 +3009,9 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { barrier.await(); for (int i = 0; i < 1000; i++) { + if (i % 100 == 0 && U.currentTimeMillis() > stopTime) + break; + try { try (Transaction tx = txs.txStart(OPTIMISTIC, SERIALIZABLE)) { Integer val = cache.get(key); @@ -3036,6 +3041,9 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest { assertTrue(cntr.get() > 0); checkValue(key, cntr.get(), cacheName, restart); + + if (U.currentTimeMillis() > stopTime) + break; } stop.set(true);
