Repository: incubator-ignite Updated Branches: refs/heads/ignite-80 e4867e4bd -> 11da6cd32
#IGNITE-80 Debug Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/11da6cd3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/11da6cd3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/11da6cd3 Branch: refs/heads/ignite-80 Commit: 11da6cd3277190c2498194125015e09d37645599 Parents: e4867e4 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Apr 14 17:57:18 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Apr 14 17:57:18 2015 -0700 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheMvccManager.java | 3 ++- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 6 ++++-- .../cache/distributed/near/GridNearTxPrepareFuture.java | 7 ++++++- 3 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11da6cd3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java index 5472955..6574f6a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java @@ -237,8 +237,9 @@ public class GridCacheMvccManager extends GridCacheSharedManagerAdapter { /** * @return Collection of active futures. */ + @SuppressWarnings("unchecked") public Collection<GridCacheFuture<?>> activeFutures() { - return F.flatCollections(futs.values()); + return F.concat(false, F.flatCollections(futs.values()), (Collection)atomicFuts.values()); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11da6cd3/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 5e2da1d..a9f89b1 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 @@ -575,6 +575,8 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT break; } catch (IgniteFutureTimeoutCheckedException ignored) { + U.debug(log, "Release future: " + partReleaseFut); + // Print pending transactions and locks that might have led to hang. dumpPendingObjects(); } @@ -678,8 +680,8 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT * */ private void dumpPendingObjects() { - U.warn(log, "Failed to wait for partition release future. Dumping pending objects that might be the cause: " + - cctx.localNodeId()); + U.warn(log, "Failed to wait for partition release future. Dumping pending objects that might be " + + "the cause [locNodeId=" + cctx.localNodeId() + ", exchId=" + exchId + ']'); U.warn(log, "Pending transactions:"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11da6cd3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java index 2589103..3dbb652 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFuture.java @@ -397,7 +397,12 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut return null; } - return nonLocCtx.topology().topologyVersionFuture(); + GridDhtTopologyFuture fut = nonLocCtx.topology().topologyVersionFuture(); + + GridDebug.debug("Will use topology version future for prepare [locNodeId=" + cctx.localNodeId() + + ", tx=" + tx + ", fut=" + fut + ']'); + + return fut; } /**
