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 <[email protected]> Authored: Tue Apr 5 16:58:19 2016 -0700 Committer: Alexey Goncharuk <[email protected]> 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<K, V> 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<K, V> extends GridCacheSharedMana } } - dumpPendingObjects(null); + dumpPendingObjects(exchTopVer); for (GridCacheContext cacheCtx : cctx.cacheContexts()) cacheCtx.preloader().dumpDebugInfo(); @@ -1170,7 +1177,7 @@ public class GridCachePartitionExchangeManager<K, V> 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<AffinityT U.warn(log, "Failed to wait for partition release future [topVer=" + topologyVersion() + ", node=" + cctx.localNodeId() + "]. Dumping pending objects that might be the cause: "); - cctx.exchange().dumpPendingObjects(topologyVersion()); + cctx.exchange().dumpDebugInfo(topologyVersion()); } /**
