Repository: ignite Updated Branches: refs/heads/master ec9d47b19 -> 42b8000c7
NPE in GridDhtPartitionDemander.requestPartitions. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7b17bb85 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7b17bb85 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7b17bb85 Branch: refs/heads/master Commit: 7b17bb85f262efa991c83e92cbf3545caedfac33 Parents: f3b0672 Author: sboikov <[email protected]> Authored: Mon Jun 26 13:41:45 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Jun 26 13:41:45 2017 +0300 ---------------------------------------------------------------------- .../distributed/dht/preloader/GridDhtPartitionDemander.java | 5 ++--- .../discovery/GridDiscoveryManagerAliveCacheSelfTest.java | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7b17bb85/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 e4f0d08..15caae2 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 @@ -363,7 +363,6 @@ public class GridDhtPartitionDemander { /** * @param fut Rebalance future. * @param assigns Assignments. - * @throws IgniteCheckedException If failed. */ private void requestPartitions(final RebalanceFuture fut, GridDhtPreloaderAssignments assigns) { assert fut != null; @@ -398,10 +397,10 @@ public class GridDhtPartitionDemander { for (Map.Entry<ClusterNode, GridDhtPartitionDemandMessage> e : assigns.entrySet()) { final ClusterNode node = e.getKey(); - final Collection<Integer> parts = fut.remaining.get(node.id()).get2(); - GridDhtPartitionDemandMessage d = e.getValue(); + final Collection<Integer> parts = d.partitions(); + U.log(log, "Starting rebalancing [mode=" + cfg.getRebalanceMode() + ", fromNode=" + node.id() + ", partitionsCount=" + parts.size() + ", topology=" + fut.topologyVersion() + ", updateSeq=" + fut.updateSeq + "]"); http://git-wip-us.apache.org/repos/asf/ignite/blob/7b17bb85/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java index 3807939..a8afa8b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAliveCacheSelfTest.java @@ -169,8 +169,6 @@ public class GridDiscoveryManagerAliveCacheSelfTest extends GridCommonAbstractTe * @throws Exception If failed. */ public void testAlivesClient() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-1583";); - clientMode = true; doTestAlive();
