Repository: ignite Updated Branches: refs/heads/ignite-1537 ae2383fcf -> d29395e62
ignite-2146 Avoid hang in 'cache.get' if topology locked. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d29395e6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d29395e6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d29395e6 Branch: refs/heads/ignite-1537 Commit: d29395e6289a72aea3a63d9c4b87d1d1d828b05c Parents: ae2383f Author: sboikov <[email protected]> Authored: Wed Dec 16 15:26:03 2015 +0300 Committer: sboikov <[email protected]> Committed: Wed Dec 16 15:26:03 2015 +0300 ---------------------------------------------------------------------- .../IgniteStartCacheInTransactionSelfTest.java | 37 ++++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d29395e6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java index 1e10a03..ccc740c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java @@ -35,6 +35,8 @@ import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; +import static org.apache.ignite.transactions.TransactionConcurrency.*; +import static org.apache.ignite.transactions.TransactionIsolation.*; /** * Check starting cache in transaction. @@ -43,6 +45,9 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes /** */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + /** */ + private static final String EXPECTED_MSG = "Cannot start/stop cache within lock or transaction."; + /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); @@ -97,8 +102,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes final String key = "key"; final String val = "val"; - try (Transaction tx = ignite.transactions().txStart( - TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)){ + try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){ ignite.cache(null).put(key, val); GridTestUtils.assertThrows(log, new Callable<Object>() { @@ -107,7 +111,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes return null; } - }, IgniteException.class, "Cannot start/stop cache within transaction."); + }, IgniteException.class, EXPECTED_MSG); tx.commit(); } @@ -122,8 +126,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes final String key = "key"; final String val = "val"; - try (Transaction tx = ignite.transactions().txStart( - TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)){ + try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){ ignite.cache(null).put(key, val); GridTestUtils.assertThrows(log, new Callable<Object>() { @@ -132,7 +135,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes return null; } - }, IgniteException.class, "Cannot start/stop cache within transaction."); + }, IgniteException.class, EXPECTED_MSG); tx.commit(); } @@ -147,8 +150,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes final String key = "key"; final String val = "val"; - try (Transaction tx = ignite.transactions().txStart( - TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)){ + try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){ ignite.cache(null).put(key, val); GridTestUtils.assertThrows(log, new Callable<Object>() { @@ -157,7 +159,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes return null; } - }, IgniteException.class, "Cannot start/stop cache within transaction."); + }, IgniteException.class, EXPECTED_MSG); tx.commit(); } @@ -172,8 +174,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes final String key = "key"; final String val = "val"; - try (Transaction tx = ignite.transactions().txStart( - TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)){ + try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){ ignite.cache(null).put(key, val); GridTestUtils.assertThrows(log, new Callable<Object>() { @@ -182,7 +183,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes return null; } - }, IgniteException.class, "Cannot start/stop cache within transaction."); + }, IgniteException.class, EXPECTED_MSG); tx.commit(); } @@ -197,8 +198,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes final String key = "key"; final String val = "val"; - try (Transaction tx = ignite.transactions().txStart( - TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)){ + try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){ ignite.cache(null).put(key, val); GridTestUtils.assertThrows(log, new Callable<Object>() { @@ -207,7 +207,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes return null; } - }, IgniteException.class, "Cannot start/stop cache within transaction."); + }, IgniteException.class, EXPECTED_MSG); tx.commit(); } @@ -222,8 +222,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes final String key = "key"; final String val = "val"; - try (Transaction tx = ignite.transactions().txStart( - TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ)){ + try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)){ ignite.cache(null).put(key, val); GridTestUtils.assertThrows(log, new Callable<Object>() { @@ -232,7 +231,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes return null; } - }, IgniteException.class, "Cannot start/stop cache within transaction."); + }, IgniteException.class, EXPECTED_MSG); tx.commit(); } @@ -259,7 +258,7 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes return null; } - }, IgniteException.class, "Cannot start/stop cache within lock."); + }, IgniteException.class, EXPECTED_MSG); lock.unlock(); }
