From commits-return-116249-archive-asf-public=cust-asf.ponee.io@ignite.apache.org Thu Jan 11 11:15:17 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id CF8CD180656 for ; Thu, 11 Jan 2018 11:15:17 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BF9E5160C20; Thu, 11 Jan 2018 10:15:17 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 11B3A160C1F for ; Thu, 11 Jan 2018 11:15:16 +0100 (CET) Received: (qmail 54787 invoked by uid 500); 11 Jan 2018 10:15:16 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 54778 invoked by uid 99); 11 Jan 2018 10:15:16 -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; Thu, 11 Jan 2018 10:15:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 11E9DE945F; Thu, 11 Jan 2018 10:15:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Message-Id: <6eb6f0f8823a4900bd1fb402469f8a44@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-7377 Correctly re-create cache entry for tx entry Date: Thu, 11 Jan 2018 10:15:16 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/master 2de75fd45 -> ba9c11041 ignite-7377 Correctly re-create cache entry for tx entry Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ba9c1104 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ba9c1104 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ba9c1104 Branch: refs/heads/master Commit: ba9c11041c9a2659340d1dbb34b075f2e306c815 Parents: 2de75fd Author: sboikov Authored: Thu Jan 11 13:15:07 2018 +0300 Committer: sboikov Committed: Thu Jan 11 13:15:07 2018 +0300 ---------------------------------------------------------------------- .../cache/transactions/IgniteTxManager.java | 29 +++++++++++++++++++- .../util/tostring/GridToStringBuilder.java | 3 ++ 2 files changed, 31 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ba9c1104/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 77634bd..a9353f4 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 @@ -1610,7 +1610,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { if (txEntry2 == txEntry1) break; - txEntry2.cached().txUnlock(tx); + txUnlock(tx, txEntry2); } return false; @@ -1648,6 +1648,33 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { } /** + * @param tx Transaction. + * @param txEntry Entry to unlock. + */ + private void txUnlock(IgniteInternalTx tx, IgniteTxEntry txEntry) { + while (true) { + try { + txEntry.cached().txUnlock(tx); + + break; + } + catch (GridCacheEntryRemovedException ignored) { + if (log.isDebugEnabled()) + log.debug("Got removed entry in TM txUnlock(..) method (will retry): " + txEntry); + + try { + txEntry.cached(txEntry.context().cache().entryEx(txEntry.key(), tx.topologyVersion())); + } + catch (GridDhtInvalidPartitionException e) { + tx.addInvalidPartition(txEntry.context(), e.partition()); + + break; + } + } + } + } + + /** * @param tx Owning transaction. * @param entries Entries to unlock. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/ba9c1104/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java index ab3bb75..e633ded 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/tostring/GridToStringBuilder.java @@ -1048,6 +1048,9 @@ public class GridToStringBuilder { */ @SuppressWarnings({"ConstantConditions", "unchecked"}) public static String arrayToString(Class arrType, Object arr) { + if (arr == null) + return "null"; + T[] array = (T[])arr; if (array.length > COLLECTION_LIMIT)