IGNITE-6181 wip.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5f3a67d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5f3a67d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5f3a67d Branch: refs/heads/ignite-6181-1 Commit: d5f3a67dc258dfb19279481c831377b97955b365 Parents: 94acdf5 Author: Aleksei Scherbakov <[email protected]> Authored: Thu Aug 31 15:25:00 2017 +0300 Committer: Aleksei Scherbakov <[email protected]> Committed: Thu Aug 31 15:25:00 2017 +0300 ---------------------------------------------------------------------- .../cache/transactions/IgniteTxHandler.java | 8 +++--- .../transactions/TxRollbackOnTimeoutTest.java | 26 ++++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d5f3a67d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java index de0e415..6f96b4b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java @@ -673,8 +673,8 @@ public class IgniteTxHandler { * @param res Response. */ private void processNearTxFinishResponse(UUID nodeId, GridNearTxFinishResponse res) { - if (txFinishMsgLog.isDebugEnabled()) - txFinishMsgLog.debug("Received near finish response [txId=" + res.xid() + ", node=" + nodeId + ']'); + //if (txFinishMsgLog.isDebugEnabled()) + txFinishMsgLog.info("Received near finish response [txId=" + res.xid() + ", node=" + nodeId + ']'); ctx.tm().onFinishedRemote(nodeId, res.threadId()); @@ -783,8 +783,8 @@ public class IgniteTxHandler { UUID nodeId, GridNearTxFinishRequest req ) { - if (txFinishMsgLog.isDebugEnabled()) - txFinishMsgLog.debug("Received near finish request [txId=" + req.version() + ", node=" + nodeId + ']'); + //if (txFinishMsgLog.isDebugEnabled()) + txFinishMsgLog.info("Received near finish request [txId=" + req.version() + ", node=" + nodeId + ']'); IgniteInternalFuture<IgniteInternalTx> fut = finish(nodeId, null, req); http://git-wip-us.apache.org/repos/asf/ignite/blob/d5f3a67d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java index 52f099d..9243f58 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutTest.java @@ -130,11 +130,11 @@ public class TxRollbackOnTimeoutTest extends GridCommonAbstractTest { /** * Tests if timeout on first tx unblocks second tx waiting for the locked key. */ -// public void testWaitingTxUnblockedOnTimeout3() throws Exception { -// Ignite client = startGrid("client"); -// -// testWaitingTxUnblockedOnTimeout0(grid(0), client); -// } + public void testWaitingTxUnblockedOnTimeout3() throws Exception { + Ignite client = startGrid("client"); + + testWaitingTxUnblockedOnTimeout0(grid(0), client); + } /** * Tests if timeout on first tx unblocks second tx waiting for the locked key. @@ -171,11 +171,11 @@ public class TxRollbackOnTimeoutTest extends GridCommonAbstractTest { /** * Tests if timeout on first tx unblocks second tx waiting for the locked key. */ -// public void testWaitingTxUnblockedOnTimeout8() throws Exception { -// Ignite client = startGrid("client"); -// -// testWaitingTxUnblockedOnThreadDeath0(grid(0), client); -// } + public void testWaitingTxUnblockedOnTimeout8() throws Exception { + Ignite client = startGrid("client"); + + testWaitingTxUnblockedOnThreadDeath0(grid(0), client); + } /** * Tests if timeout on first tx unblocks second tx waiting for the locked key. @@ -268,11 +268,11 @@ public class TxRollbackOnTimeoutTest extends GridCommonAbstractTest { } }, 2, "Second"); - fut2.get(5, TimeUnit.SECONDS); + fut2.get(); unblocked.countDown(); - fut1.get(5, TimeUnit.SECONDS); + fut1.get(); } /** */ @@ -315,6 +315,6 @@ public class TxRollbackOnTimeoutTest extends GridCommonAbstractTest { // No-op. } - fut2.get(5, TimeUnit.SECONDS); + fut2.get(); } } \ No newline at end of file
