Repository: incubator-ignite Updated Branches: refs/heads/ignite-80 42802b29a -> c46f7e7cf
#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/c46f7e7c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c46f7e7c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c46f7e7c Branch: refs/heads/ignite-80 Commit: c46f7e7cf94193d10a4189d6c584907b7502cf78 Parents: 42802b2 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Mon Apr 13 17:40:23 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Mon Apr 13 17:40:23 2015 -0700 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheIoManager.java | 3 +++ .../cache/distributed/near/GridNearTxPrepareFuture.java | 2 +- .../apache/ignite/internal/util/future/GridCompoundFuture.java | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c46f7e7c/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 63c7396..9855283 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 @@ -95,6 +95,9 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { } } else { + U.debug(log, "Received unordered cache communication message [nodeId=" + nodeId + + ", locId=" + cctx.localNodeId() + ", msg=" + msg + ']'); + AffinityTopologyVersion locAffVer = cctx.exchange().readyAffinityVersion(); AffinityTopologyVersion rmtAffVer = cacheMsg.topologyVersion(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c46f7e7c/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 df07fce..2589103 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 @@ -68,7 +68,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut private IgniteUuid futId; /** Transaction. */ - @GridToStringInclude + @GridToStringExclude private GridNearTxLocal tx; /** Error. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c46f7e7c/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java index dcd6b9b..a8a545d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java @@ -42,6 +42,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> { private final ConcurrentLinkedDeque8<IgniteInternalFuture<T>> futs = new ConcurrentLinkedDeque8<>(); /** Pending futures. */ + @GridToStringInclude private final Collection<IgniteInternalFuture<T>> pending = new ConcurrentLinkedDeque8<>(); /** Listener call count. */