Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 055F310537 for ; Tue, 28 Apr 2015 13:55:41 +0000 (UTC) Received: (qmail 73401 invoked by uid 500); 28 Apr 2015 13:55:41 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 73328 invoked by uid 500); 28 Apr 2015 13:55:40 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 73290 invoked by uid 99); 28 Apr 2015 13:55:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2015 13:55:40 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2015 13:55:36 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 35C2F283F1 for ; Tue, 28 Apr 2015 13:55:16 +0000 (UTC) Received: (qmail 66357 invoked by uid 99); 28 Apr 2015 13:54:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Apr 2015 13:54:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 00705E32B8; Tue, 28 Apr 2015 13:54:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 28 Apr 2015 13:54:09 -0000 Message-Id: <307caeda7be946bfbf317051b253e466@git.apache.org> In-Reply-To: <229644b863b24dd096774e83f976d9d3@git.apache.org> References: <229644b863b24dd096774e83f976d9d3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/17] incubator-ignite git commit: # ignite-157-1 X-Virus-Checked: Checked by ClamAV on apache.org # ignite-157-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0f33ab0e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0f33ab0e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0f33ab0e Branch: refs/heads/ignite-sprint-4 Commit: 0f33ab0e9c19e964a470de5444df7b59d3162e58 Parents: 5443383 Author: sboikov Authored: Sun Apr 26 20:35:10 2015 +0300 Committer: sboikov Committed: Sun Apr 26 20:35:10 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/distributed/dht/GridDhtTxRemote.java | 7 +++++++ .../processors/cache/transactions/IgniteTxHandler.java | 2 ++ .../processors/cache/transactions/IgniteTxManager.java | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f33ab0e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java index 2673ed5..30464a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java @@ -178,6 +178,13 @@ public class GridDhtTxRemote extends GridDistributedTxRemoteAdapter { topologyVersion(topVer); } + /** + * @param txNodes Transaction nodes. + */ + public void transactionNodes(Map> txNodes) { + this.txNodes = txNodes; + } + /** {@inheritDoc} */ @Override public boolean dht() { return true; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f33ab0e/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 b2abe49..6b45fee 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 @@ -1035,6 +1035,8 @@ public class IgniteTxHandler { return null; } } + else + tx.transactionNodes(req.transactionNodes()); if (!tx.isSystemInvalidate() && !F.isEmpty(req.writes())) { int idx = 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f33ab0e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index f4c138c..c494602 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -2062,7 +2062,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { else { // Check prepare only if originating node ID failed. Otherwise parent node will finish this tx. if (tx.originatingNodeId().equals(evtNodeId)) { - if (tx.optimistic() && tx.state() == PREPARED) + if (tx.state() == PREPARED) commitIfPrepared(tx); else { IgniteInternalFuture prepFut = tx.currentPrepareFuture(); @@ -2070,7 +2070,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { if (prepFut != null) { prepFut.listen(new CI1>() { @Override public void apply(IgniteInternalFuture fut) { - if (tx.optimistic() && tx.state() == PREPARED) + if (tx.state() == PREPARED) commitIfPrepared(tx); else if (tx.setRollbackOnly()) tx.rollbackAsync();