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 <[email protected]> Authored: Thu Jul 13 13:30:59 2017 +0300 Committer: sboikov <[email protected]> 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);
