ignite-comm-balance
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/03593023 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/03593023 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/03593023 Branch: refs/heads/ignite-4371 Commit: 03593023dabe8bf295760c9a387a3e9af8964112 Parents: e88dbd8 Author: sboikov <[email protected]> Authored: Thu Dec 8 13:51:40 2016 +0300 Committer: sboikov <[email protected]> Committed: Thu Dec 8 13:51:40 2016 +0300 ---------------------------------------------------------------------- .../TxOptimisticDeadlockDetectionTest.java | 29 ++++++++++++-------- 1 file changed, 18 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/03593023/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java index aa240aa..f6a06c2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java @@ -111,6 +111,9 @@ public class TxOptimisticDeadlockDetectionTest extends GridCommonAbstractTest { cfg.setClientMode(client); + // Test spi blocks message send, this can cause hang with striped pool. + cfg.setStripedPoolSize(-1); + return cfg; } @@ -274,8 +277,8 @@ public class TxOptimisticDeadlockDetectionTest extends GridCommonAbstractTest { Object k; - log.info(">>> Performs put [node=" + ((IgniteKernal)ignite).localNode() + - ", tx=" + tx + ", key=" + transformer.apply(key) + ']'); + log.info(">>> Performs put [node=" + ((IgniteKernal)ignite).localNode().id() + + ", tx=" + tx.xid() + ", key=" + transformer.apply(key) + ']'); cache.put(transformer.apply(key), 0); @@ -309,23 +312,27 @@ public class TxOptimisticDeadlockDetectionTest extends GridCommonAbstractTest { entries.put(k, 2); } - log.info(">>> Performs put [node=" + ((IgniteKernal)ignite).localNode() + - ", tx=" + tx + ", entries=" + entries + ']'); + log.info(">>> Performs put [node=" + ((IgniteKernal)ignite).localNode().id() + + ", tx=" + tx.xid() + ", entries=" + entries + ']'); cache.putAll(entries); tx.commit(); } catch (Throwable e) { - U.error(log, "Expected exception: ", e); + log.info("Expected exception: " + e); + + e.printStackTrace(System.out); // At least one stack trace should contain TransactionDeadlockException. if (hasCause(e, TransactionTimeoutException.class) && - hasCause(e, TransactionDeadlockException.class) - ) { - if (deadlockErr.compareAndSet(null, cause(e, TransactionDeadlockException.class))) - U.error(log, "At least one stack trace should contain " + - TransactionDeadlockException.class.getSimpleName(), e); + hasCause(e, TransactionDeadlockException.class)) { + if (deadlockErr.compareAndSet(null, cause(e, TransactionDeadlockException.class))) { + log.info("At least one stack trace should contain " + + TransactionDeadlockException.class.getSimpleName()); + + e.printStackTrace(System.out); + } } } } @@ -344,7 +351,7 @@ public class TxOptimisticDeadlockDetectionTest extends GridCommonAbstractTest { TransactionDeadlockException deadlockE = deadlockErr.get(); - assertNotNull(deadlockE); + assertNotNull("Failed to detect deadlock", deadlockE); boolean fail = false;
