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 D9C7318A39 for ; Wed, 6 Apr 2016 07:55:08 +0000 (UTC) Received: (qmail 68046 invoked by uid 500); 6 Apr 2016 07:55:08 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 67962 invoked by uid 500); 6 Apr 2016 07:55:08 -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 67078 invoked by uid 99); 6 Apr 2016 07:55:07 -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; Wed, 06 Apr 2016 07:55:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 08898DFDEC; Wed, 6 Apr 2016 07:55:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.apache.org Date: Wed, 06 Apr 2016 07:55:52 -0000 Message-Id: <5b0bd84bfa9b44c2bf5aaf67bcbc3eb6@git.apache.org> In-Reply-To: <2aa8831670f14c30abc23165697f9659@git.apache.org> References: <2aa8831670f14c30abc23165697f9659@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [47/50] [abbrv] ignite git commit: Fixed dump debug info on release future timeout. Fixed dump debug info on release future timeout. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1b0c1735 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1b0c1735 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1b0c1735 Branch: refs/heads/ignite-2630 Commit: 1b0c173543788358a8551838969fc1d21741ea69 Parents: e8435e7 Author: Alexey Goncharuk Authored: Tue Apr 5 16:58:19 2016 -0700 Committer: Alexey Goncharuk Committed: Tue Apr 5 16:58:19 2016 -0700 ---------------------------------------------------------------------- .../cache/GridCachePartitionExchangeManager.java | 11 +++++++++-- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1b0c1735/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index 0d9f174..2b7b621 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -1125,6 +1125,13 @@ public class GridCachePartitionExchangeManager extends GridCacheSharedMana * */ public void dumpDebugInfo() { + dumpDebugInfo(null); + } + + /** + * + */ + public void dumpDebugInfo(@Nullable AffinityTopologyVersion exchTopVer) { U.warn(log, "Ready affinity version: " + readyTopVer.get()); U.warn(log, "Last exchange future: " + lastInitializedFut); @@ -1156,7 +1163,7 @@ public class GridCachePartitionExchangeManager extends GridCacheSharedMana } } - dumpPendingObjects(null); + dumpPendingObjects(exchTopVer); for (GridCacheContext cacheCtx : cctx.cacheContexts()) cacheCtx.preloader().dumpDebugInfo(); @@ -1170,7 +1177,7 @@ public class GridCachePartitionExchangeManager extends GridCacheSharedMana /** * @param exchTopVer Exchange topology version. */ - public void dumpPendingObjects(@Nullable AffinityTopologyVersion exchTopVer) { + private void dumpPendingObjects(@Nullable AffinityTopologyVersion exchTopVer) { IgniteTxManager tm = cctx.tm(); if (tm != null) { http://git-wip-us.apache.org/repos/asf/ignite/blob/1b0c1735/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index c879016..bbfc71a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -889,7 +889,7 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter