ignite-1189: 4 reproducing deadlock
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/132562b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/132562b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/132562b4 Branch: refs/heads/ignite-1108 Commit: 132562b431bc3250abe56ec48725c5ebe6083964 Parents: 28c9977 Author: Denis Magda <dma...@gridgain.com> Authored: Tue Aug 4 12:26:00 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Tue Aug 4 12:26:00 2015 +0300 ---------------------------------------------------------------------- .../dht/atomic/GridDhtAtomicCache.java | 8 ++-- .../IgniteCacheAtomicNodeRestartTest.java | 45 ++++++++++++++++++++ 2 files changed, 48 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/132562b4/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 4d73fb2..cd6e28d 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 @@ -1152,11 +1152,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { e.printStackTrace(); } - catch (Exception e) { - U.error(log, "FUCK ERROR", e); - - throw e; - } finally { if (locked != null) unlockEntries(locked, req.topologyVersion()); @@ -1179,6 +1174,9 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { remap = true; } + catch (Exception e) { + U.error(log, "Unexpected exception during cache update", e); + } if (remap) { assert dhtFut == null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/132562b4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java index 70e6c4c..caee4d0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheAtomicNodeRestartTest.java @@ -36,7 +36,52 @@ public class IgniteCacheAtomicNodeRestartTest extends GridCachePartitionedNodeRe super.testRestartWithPutTenNodesTwoBackups(); } + public void testRestartWithPutTenNodesTwoBackups2() throws Throwable { + super.testRestartWithPutTenNodesTwoBackups(); + } + public void testRestartWithPutTenNodesTwoBackups3() throws Throwable { + super.testRestartWithPutTenNodesTwoBackups(); + } + public void testRestartWithPutTenNodesTwoBackups4() throws Throwable { + super.testRestartWithPutTenNodesTwoBackups(); + } + public void testRestartWithPutTenNodesTwoBackups5() throws Throwable { + super.testRestartWithPutTenNodesTwoBackups(); + } + public void testRestartWithPutTenNodesTwoBackups6() throws Throwable { + super.testRestartWithPutTenNodesTwoBackups(); + } + public void testRestartWithPutTenNodesTwoBackups7() throws Throwable { + super.testRestartWithPutTenNodesTwoBackups(); + } + public void testRestartWithPutTenNodesTwoBackups8() throws Throwable { + super.testRestartWithPutTenNodesTwoBackups(); + } + public void testRestartWithPutTenNodesTwoBackups9() throws Throwable { + super.testRestartWithPutTenNodesTwoBackups(); + } + public void testRestartWithPutTenNodesTwoBackups10() throws Throwable { + super.testRestartWithPutTenNodesTwoBackups(); + } + public void testRestartWithPutTenNodesTwoBackups11() throws Throwable { + super.testRestartWithPutTenNodesTwoBackups(); + } + public void testRestartWithPutTenNodesTwoBackups12() throws Throwable { + super.testRestartWithPutTenNodesTwoBackups(); + } + public void testRestartWithPutTenNodesTwoBackups13() throws Throwable { + super.testRestartWithPutTenNodesTwoBackups(); + } + public void testRestartWithPutTenNodesTwoBackups14() throws Throwable { + super.testRestartWithPutTenNodesTwoBackups(); + } + + @Override protected long getTestTimeout() { + return Long.MAX_VALUE; + } + @Override public void testRestart() throws Exception { + } @Override public void testRestartWithPutTwoNodesNoBackups() throws Throwable {
