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 AE6A6186D6 for ; Tue, 16 Jun 2015 08:21:22 +0000 (UTC) Received: (qmail 50006 invoked by uid 500); 16 Jun 2015 08:21:22 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 49974 invoked by uid 500); 16 Jun 2015 08:21:22 -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 49965 invoked by uid 99); 16 Jun 2015 08:21:22 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jun 2015 08:21:22 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 15EEE182829 for ; Tue, 16 Jun 2015 08:21:22 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id d-B7wXAURdZO for ; Tue, 16 Jun 2015 08:21:12 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id AD2B72763C for ; Tue, 16 Jun 2015 08:21:11 +0000 (UTC) Received: (qmail 49269 invoked by uid 99); 16 Jun 2015 08:21:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jun 2015 08:21:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 60A79DFB90; Tue, 16 Jun 2015 08:21:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 16 Jun 2015 08:21:11 -0000 Message-Id: <2cf7126f010142d58f6890c591b5edde@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/50] incubator-ignite git commit: ignite-389 Partition scan fallback test fixed Repository: incubator-ignite Updated Branches: refs/heads/ignite-gg-10411 3f20d124d -> 207e2c7b4 ignite-389 Partition scan fallback test fixed Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9fca6b50 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9fca6b50 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9fca6b50 Branch: refs/heads/ignite-gg-10411 Commit: 9fca6b5005a6f5ddd16af936c6445748b398ed39 Parents: 7e8f648 Author: agura Authored: Tue Jun 9 14:42:49 2015 +0300 Committer: agura Committed: Tue Jun 9 14:42:49 2015 +0300 ---------------------------------------------------------------------- ...CacheScanPartitionQueryFallbackSelfTest.java | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9fca6b50/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java index dfa7296..b7f5fa8 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheScanPartitionQueryFallbackSelfTest.java @@ -31,6 +31,8 @@ import org.apache.ignite.lang.*; import org.apache.ignite.plugin.extensions.communication.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.communication.tcp.*; +import org.apache.ignite.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import java.util.*; @@ -47,6 +49,9 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT /** Keys count. */ private static final int KEYS_CNT = 5000; + /** Ip finder. */ + private static final TcpDiscoveryVmIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + /** Backups. */ private int backups; @@ -75,6 +80,13 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); + cfg.setClientMode(clientMode); + + TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + discoSpi.setIpFinder(IP_FINDER); + discoSpi.setForceServerMode(true); + cfg.setDiscoverySpi(discoSpi); + cfg.setCommunicationSpi(commSpiFactory.create()); CacheConfiguration ccfg = defaultCacheConfiguration(); @@ -85,8 +97,6 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT cfg.setCacheConfiguration(ccfg); - cfg.setClientMode(clientMode); - return cfg; } @@ -183,6 +193,7 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT if (!test.get()) { candidates.addAll(localPartitions(ignite1)); + candidates.retainAll(localPartitions(ignite2)); } @@ -195,8 +206,9 @@ public class CacheScanPartitionQueryFallbackSelfTest extends GridCommonAbstractT awaitPartitionMapExchange(); if (!test.get()) { - Set parts = localPartitions(ignite1); - candidates.removeAll(parts); + candidates.removeAll(localPartitions(ignite1)); + + F.retain(candidates, false, localPartitions(ignite2)); } latch.countDown();