ignite-1282 - Debugging failover.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4844b3ed Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4844b3ed Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4844b3ed Branch: refs/heads/ignite-1956 Commit: 4844b3edafe2ec3d5eaf93ce56a87c45e2b8e950 Parents: 6dc6ffe Author: Alexey Goncharuk <[email protected]> Authored: Tue Nov 24 14:41:08 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Tue Nov 24 14:41:08 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheIoManager.java | 2 ++ .../processors/cache/distributed/dht/GridDhtTxFinishFuture.java | 1 + .../cache/distributed/dht/GridPartitionedSingleGetFuture.java | 3 ++- .../distributed/dht/IgniteCachePutRetryAbstractSelfTest.java | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4844b3ed/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index 9afbca8..7b1d749 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@ -145,6 +145,8 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { } if (fut != null && !fut.isDone()) { + U.debug(log, "<> Will wait for affinity ready future [fut=" + fut + ", msg=" + msg + ']'); + fut.listen(new CI1<IgniteInternalFuture<?>>() { @Override public void apply(IgniteInternalFuture<?> t) { cctx.kernalContext().closure().runLocalSafe(new Runnable() { http://git-wip-us.apache.org/repos/asf/ignite/blob/4844b3ed/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java index e8ef5d4..c4a90b1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java @@ -474,6 +474,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur }); return S.toString(GridDhtTxFinishFuture.class, this, + "xidVer", tx.xidVersion(), "innerFuts", futs, "super", super.toString()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/4844b3ed/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java index f276cac..a5e5d53 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java @@ -323,7 +323,7 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter<Object> im GridDhtCacheAdapter colocated = cctx.dht(); while (true) { - GridCacheEntryEx entry; + GridCacheEntryEx entry = null; try { entry = colocated.context().isSwapOrOffheapEnabled() ? colocated.entryEx(key) : @@ -401,6 +401,7 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter<Object> im return null; } catch (GridCacheEntryRemovedException ignored) { + U.debug(log, ">>>>>>>>> " + entry); // No-op, will retry. } } http://git-wip-us.apache.org/repos/asf/ignite/blob/4844b3ed/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java index ee28cf9..ce09a64 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java @@ -122,6 +122,8 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst cfg.setSwapSpaceSpi(new GridTestSwapSpaceSpi()); + cfg.setIncludeEventTypes(new int[0]); + return cfg; }
