Repository: ignite Updated Branches: refs/heads/ignite-5578-locJoin 7ea291587 -> 73add3106
ignite-5578 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/73add310 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/73add310 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/73add310 Branch: refs/heads/ignite-5578-locJoin Commit: 73add3106c9537f8f12ae597c5f94a8120fdfe05 Parents: 7ea2915 Author: sboikov <[email protected]> Authored: Thu Jul 13 15:22:26 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Jul 13 15:22:26 2017 +0300 ---------------------------------------------------------------------- .../cache/GridCachePartitionExchangeManager.java | 11 ++++++----- .../org/apache/ignite/testsuites/IgnitePdsTestSuite.java | 3 +++ 2 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/73add310/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index 06f336e..cfc3671 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -1439,12 +1439,13 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana return; try { - GridDhtPartitionsExchangeFuture fut = exchFuts.find(msg.exchangeId()); + final GridDhtPartitionsExchangeFuture exchFut = exchangeFuture(msg.exchangeId(), + null, + null, + null, + null); - if (fut != null) - fut.processSinglePartitionRequest(node, msg); - else - sendLocalPartitions(node, msg.exchangeId()); + exchFut.processSinglePartitionRequest(node, msg); } finally { leaveBusy(); http://git-wip-us.apache.org/repos/asf/ignite/blob/73add310/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java index eaf4a01..5762c02 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java @@ -18,6 +18,7 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; +import org.apache.ignite.internal.processors.cache.IgniteClusterActivateDeactivateTestWithPersistence; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsClientNearCachePutGetTest; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsDynamicCacheTest; import org.apache.ignite.internal.processors.cache.persistence.IgnitePdsSingleNodePutGetPersistenceTest; @@ -72,6 +73,8 @@ public class IgnitePdsTestSuite extends TestSuite { suite.addTestSuite(IgnitePdsDynamicCacheTest.class); suite.addTestSuite(IgnitePdsClientNearCachePutGetTest.class); + suite.addTestSuite(IgniteClusterActivateDeactivateTestWithPersistence.class); + suite.addTestSuite(IgnitePdsCacheRestoreTest.class); return suite;
