Repository: ignite Updated Branches: refs/heads/ignite-3477-putdown 012d8c512 -> 121af5ce5
ignite-db-x small fix, add print more info for investigation Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/16f64d1f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/16f64d1f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/16f64d1f Branch: refs/heads/ignite-3477-putdown Commit: 16f64d1feadbfe7ced01c6f989a58aa6ddfa6523 Parents: f2f5dc9 Author: Dmitriy Govorukhin <dgovoruk...@gridgain.com> Authored: Thu Feb 2 12:04:26 2017 +0300 Committer: Dmitriy Govorukhin <dgovoruk...@gridgain.com> Committed: Thu Feb 2 12:04:26 2017 +0300 ---------------------------------------------------------------------- .../distributed/dht/preloader/GridDhtPartitionDemander.java | 1 - .../cache/query/continuous/CacheContinuousQueryHandler.java | 2 ++ .../java/org/apache/ignite/internal/util/IgniteUtils.java | 3 +++ .../rebalancing/GridCacheRebalancingSyncSelfTest.java | 8 ++++---- .../processors/continuous/GridEventConsumeSelfTest.java | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/16f64d1f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java index 04a9d1a..6bd218b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java @@ -513,7 +513,6 @@ public class GridDhtPartitionDemander { // New requests will not be covered by failovers. cctx.io().sendOrderedMessage(node, rebalanceTopics.get(cnt), initD, cctx.ioPolicy(), initD.timeout()); - } if (log.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/ignite/blob/16f64d1f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java index ea5551d..41eec6a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java @@ -448,6 +448,8 @@ public class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler } @Override public void flushBackupQueue(GridKernalContext ctx, AffinityTopologyVersion topVer) { + assert topVer != null; + Collection<CacheContinuousQueryEntry> backupQueue0 = backupQueue; if (backupQueue0 == null) http://git-wip-us.apache.org/repos/asf/ignite/blob/16f64d1f/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 1be9f75..389d058 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -7586,6 +7586,9 @@ public abstract class IgniteUtils { return fut.get(); } catch (ExecutionException e) { + //todo only for investigation + e.printStackTrace(); + throw new IgniteCheckedException(e.getCause()); } catch (InterruptedException e) { http://git-wip-us.apache.org/repos/asf/ignite/blob/16f64d1f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java index 3dfcd85..f875b75 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java @@ -240,7 +240,7 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest { waitForRebalancing(0, new AffinityTopologyVersion(2, waitMinorVer)); waitForRebalancing(1, new AffinityTopologyVersion(2, waitMinorVer)); - awaitPartitionMapExchange(true, true, null); + awaitPartitionMapExchange(true, true, null, true); checkPartitionMapExchangeFinished(); @@ -250,7 +250,7 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest { waitForRebalancing(1, 3); - awaitPartitionMapExchange(true, true, null); + awaitPartitionMapExchange(true, true, null, true); checkPartitionMapExchangeFinished(); @@ -261,7 +261,7 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest { waitForRebalancing(1, new AffinityTopologyVersion(4, waitMinorVer)); waitForRebalancing(2, new AffinityTopologyVersion(4, waitMinorVer)); - awaitPartitionMapExchange(true, true, null); + awaitPartitionMapExchange(true, true, null, true); checkPartitionMapExchangeFinished(); @@ -271,7 +271,7 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest { waitForRebalancing(1, 5); - awaitPartitionMapExchange(true, true, null); + awaitPartitionMapExchange(true, true, null, true); checkPartitionMapExchangeFinished(); http://git-wip-us.apache.org/repos/asf/ignite/blob/16f64d1f/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java index 91eecbb..d2abf11 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java @@ -24,6 +24,7 @@ import java.util.Random; import java.util.UUID; import java.util.concurrent.BlockingQueue; import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentSkipListSet; import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.AtomicBoolean; @@ -423,7 +424,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testRemoteProjection() throws Exception { - final Collection<UUID> nodeIds = new HashSet<>(); + final Collection<UUID> nodeIds = new ConcurrentSkipListSet<>(); final AtomicInteger cnt = new AtomicInteger(); final CountDownLatch latch = new CountDownLatch(GRID_CNT - 1);
