GG-9141 - Fixed preloading test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fb191309 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fb191309 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fb191309 Branch: refs/heads/ignite-41 Commit: fb19130908792ecaec93aa9fd5c9008230c25524 Parents: cf99caa Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Thu Dec 18 19:21:43 2014 -0800 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Thu Dec 18 19:21:43 2014 -0800 ---------------------------------------------------------------------- .../kernal/processors/cache/GridCachePartitionExchangeManager.java | 2 +- .../replicated/preloader/GridCacheReplicatedPreloadSelfTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb191309/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java index 8ca5911..15703a0 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java @@ -800,7 +800,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana changed |= cacheCtx.topology().afterExchange(exchFut.exchangeId()); // Preload event notification. - if (cctx.gridEvents().isRecordable(EVT_CACHE_PRELOAD_STARTED)) { + if (!cacheCtx.system() && cctx.gridEvents().isRecordable(EVT_CACHE_PRELOAD_STARTED)) { if (!cacheCtx.isReplicated() || !startEvtFired) { IgniteDiscoveryEvent discoEvt = exchFut.discoveryEvent(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fb191309/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java index 82a56a3..c5bb91e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java @@ -139,7 +139,7 @@ public class GridCacheReplicatedPreloadSelfTest extends GridCommonAbstractTest { * @throws Exception If test failed. */ @SuppressWarnings({"BusyWait"}) - public void _testIntegrity() throws Exception { // TODO GG-9141 + public void testIntegrity() throws Exception { preloadMode = SYNC; try {
