Repository: incubator-ignite Updated Branches: refs/heads/ignite-157-debug 344fcbf85 -> 2d1397994
# ignite-157-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/2d139799 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2d139799 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2d139799 Branch: refs/heads/ignite-157-debug Commit: 2d1397994b091045ade279b18a7d160d4c3d6f74 Parents: 344fcbf Author: sboikov <sboi...@gridgain.com> Authored: Tue Apr 28 11:12:28 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Apr 28 11:12:28 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheIoManager.java | 3 ++- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d139799/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 9f046e6..7b30fd8 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 @@ -24,6 +24,7 @@ import org.apache.ignite.internal.cluster.*; import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.managers.deployment.*; import org.apache.ignite.internal.processors.affinity.*; +import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*; @@ -226,7 +227,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { unmarshall(nodeId, cacheMsg); - if (!cacheMsg.partitionExchangeMessage()) + if (!cacheMsg.partitionExchangeMessage() && !(cacheMsg instanceof GridDhtPartitionDemandMessage) && !(cacheMsg instanceof GridDhtPartitionSupplyMessage)) TestDebugLog.addMessage("Message: " + cacheMsg); if (cacheMsg.allowForStartup()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d139799/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 6c2169e..9ef6cad 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 @@ -709,9 +709,14 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT for (GridCacheFuture<?> fut : cctx.mvcc().atomicFutures()) U.warn(log, ">>> " + fut); + TestDebugLog.addMessage("Release timeout"); - if (++cnt > 3) { + if (++cnt > 6) { + U.warn(log, "Stop test"); + + U.dumpThreads(log); + TestDebugLog.printMessages(false); System.exit(1);
