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 30DEF1853E for ; Tue, 26 May 2015 10:11:51 +0000 (UTC) Received: (qmail 67827 invoked by uid 500); 26 May 2015 10:11:48 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 67796 invoked by uid 500); 26 May 2015 10:11:48 -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 67786 invoked by uid 99); 26 May 2015 10:11:48 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 May 2015 10:11:48 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 8D8ECC8B4C for ; Tue, 26 May 2015 10:11:47 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.771 X-Spam-Level: X-Spam-Status: No, score=0.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 9lZCtVVVok-a for ; Tue, 26 May 2015 10:11:42 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 3B46424960 for ; Tue, 26 May 2015 10:11:34 +0000 (UTC) Received: (qmail 67154 invoked by uid 99); 26 May 2015 10:11:32 -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, 26 May 2015 10:11:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 88B6BDFF67; Tue, 26 May 2015 10:11:32 +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, 26 May 2015 10:11:43 -0000 Message-Id: <82c5372b37934e1ebec009e321548f19@git.apache.org> In-Reply-To: <4512796055094b7ca84dc5e5b9aa4daa@git.apache.org> References: <4512796055094b7ca84dc5e5b9aa4daa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/34] incubator-ignite git commit: ignite-930 - log ignite-930 - log Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6aa16b85 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6aa16b85 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6aa16b85 Branch: refs/heads/ignite-37 Commit: 6aa16b850f6f2a6179a264c0931df84c895f12dc Parents: 1c8d7c9 Author: S.Vladykin Authored: Fri May 22 08:56:00 2015 +0300 Committer: S.Vladykin Committed: Fri May 22 08:56:00 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/GridDistributedTxRemoteAdapter.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6aa16b85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java index 3215138..ad9b21d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java @@ -651,15 +651,17 @@ public class GridDistributedTxRemoteAdapter extends IgniteTxAdapter } } catch (Throwable ex) { - uncommit(); - - state(UNKNOWN); - // In case of error, we still make the best effort to commit, // as there is no way to rollback at this point. err = new IgniteTxHeuristicCheckedException("Commit produced a runtime exception " + "(all transaction entries will be invalidated): " + CU.txString(this), ex); + U.error(log, "Commit failed.", err); + + uncommit(); + + state(UNKNOWN); + if (ex instanceof Error) throw (Error)ex; }