You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/07/13 10:34:08 UTC
[1/2] ignite git commit: Unnecessary synchronous rollback in
GridDhtTxLocal.prepareAsync
Repository: ignite
Updated Branches:
refs/heads/ignite-5578-locJoin b5319a02a -> 545c76edd
Unnecessary synchronous rollback in GridDhtTxLocal.prepareAsync
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5394bbde
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5394bbde
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5394bbde
Branch: refs/heads/ignite-5578-locJoin
Commit: 5394bbdeff4e9fb97d3b413bf30001ede580bdd7
Parents: 120384f
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jul 13 13:30:59 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jul 13 13:30:59 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/GridDhtTxLocal.java | 13 -------------
1 file changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5394bbde/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
index e1bc313..5b8a7b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
@@ -416,19 +416,6 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa
setRollbackOnly();
fut.onError(new IgniteTxRollbackCheckedException("Failed to prepare transaction: " + this, e));
-
- try {
- rollbackDhtLocal();
- }
- catch (IgniteTxOptimisticCheckedException e1) {
- if (log.isDebugEnabled())
- log.debug("Failed optimistically to prepare transaction [tx=" + this + ", e=" + e1 + ']');
-
- fut.onError(e);
- }
- catch (IgniteCheckedException e1) {
- U.error(log, "Failed to rollback transaction: " + this, e1);
- }
}
return chainOnePhasePrepare(fut);
[2/2] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-5578-locJoin
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-5578-locJoin
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/545c76ed
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/545c76ed
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/545c76ed
Branch: refs/heads/ignite-5578-locJoin
Commit: 545c76edd7f2c1935e0747ad2f4f00d7207184ab
Parents: b5319a0 5394bbd
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jul 13 13:33:57 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jul 13 13:33:57 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/GridDhtTxLocal.java | 13 -------------
1 file changed, 13 deletions(-)
----------------------------------------------------------------------