Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0C79BCB42 for ; Fri, 19 Dec 2014 06:17:46 +0000 (UTC) Received: (qmail 19182 invoked by uid 500); 19 Dec 2014 06:17:46 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 19148 invoked by uid 500); 19 Dec 2014 06:17:45 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 19135 invoked by uid 99); 19 Dec 2014 06:17:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Dec 2014 06:17:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 19 Dec 2014 06:17:44 +0000 Received: (qmail 16123 invoked by uid 99); 19 Dec 2014 06:16:09 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Dec 2014 06:16:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0D488A3133E; Fri, 19 Dec 2014 06:16:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 19 Dec 2014 06:16:15 -0000 Message-Id: <92c7004e9e044943a5cb82e620e7e343@git.apache.org> In-Reply-To: <38fc6e1405554ce18f06eb39b2fc43da@git.apache.org> References: <38fc6e1405554ce18f06eb39b2fc43da@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/9] incubator-ignite git commit: GG-9141 - Fixed preloading test. X-Virus-Checked: Checked by ClamAV on apache.org 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 Authored: Thu Dec 18 19:21:43 2014 -0800 Committer: Alexey Goncharuk 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 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 {