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 5D8E017EEE for ; Mon, 1 Jun 2015 22:19:33 +0000 (UTC) Received: (qmail 71628 invoked by uid 500); 1 Jun 2015 22:19:33 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 71596 invoked by uid 500); 1 Jun 2015 22:19:33 -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 71586 invoked by uid 99); 1 Jun 2015 22:19:33 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2015 22:19:33 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id DC0FFCA83F for ; Mon, 1 Jun 2015 22:19:32 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id LJk-1n3cXOs7 for ; Mon, 1 Jun 2015 22:19:19 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 6D3E347C20 for ; Mon, 1 Jun 2015 22:19:15 +0000 (UTC) Received: (qmail 70175 invoked by uid 99); 1 Jun 2015 22:19:14 -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; Mon, 01 Jun 2015 22:19:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9CA7DE08BE; Mon, 1 Jun 2015 22:19:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 01 Jun 2015 22:19:30 -0000 Message-Id: <65d0d5242c3345bea97fa0ccaf99653b@git.apache.org> In-Reply-To: <2331b7ed2ccf46ad99699422a6f7ad50@git.apache.org> References: <2331b7ed2ccf46ad99699422a6f7ad50@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/50] [abbrv] incubator-ignite git commit: # ignite-709 can not skip preload on server nodes # ignite-709 can not skip preload on server nodes Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2c3ce158 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2c3ce158 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2c3ce158 Branch: refs/heads/ignite-389 Commit: 2c3ce158de266dfd02c91e3e6e377ce667fd598f Parents: 581f4d9 Author: sboikov Authored: Fri May 29 10:35:24 2015 +0300 Committer: sboikov Committed: Fri May 29 10:35:24 2015 +0300 ---------------------------------------------------------------------- .../GridDhtPartitionsExchangeFuture.java | 2 +- .../IgniteCacheClientNodeConcurrentStart.java | 105 +++++++++++++++++++ ...teCacheClientNodePartitionsExchangeTest.java | 6 +- .../testsuites/IgniteCacheTestSuite2.java | 1 + 4 files changed, 110 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c3ce158/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 162c7b3..145def8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -517,7 +517,7 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter clientNodes; + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + assertNotNull(clientNodes); + + ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); + + boolean client = false; + + for (Integer clientIdx : clientNodes) { + if (getTestGridName(clientIdx).equals(gridName)) { + client = true; + + break; + } + } + + cfg.setClientMode(client); + + CacheConfiguration ccfg = new CacheConfiguration(); + + ccfg.setBackups(0); + ccfg.setRebalanceMode(SYNC); + + cfg.setCacheConfiguration(ccfg); + + return cfg; + } + + /** + * @throws Exception If failed. + */ + public void testConcurrentStart() throws Exception { + ThreadLocalRandom rnd = ThreadLocalRandom.current(); + + for (int i = 0; i < 3; i++) { + try { + clientNodes = new HashSet<>(); + + while (clientNodes.size() < 2) + clientNodes.add(rnd.nextInt(0, NODES_CNT)); + + clientNodes.add(NODES_CNT - 1); + + log.info("Test iteration [iter=" + i + ", clients=" + clientNodes + ']'); + + startGridsMultiThreaded(NODES_CNT, true); + + for (int node : clientNodes) { + Ignite ignite = grid(node); + + assertTrue(ignite.configuration().isClientMode()); + } + } + finally { + stopAllGrids(); + } + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c3ce158/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java index 162aa81..68ae211 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodePartitionsExchangeTest.java @@ -158,11 +158,11 @@ public class IgniteCacheClientNodePartitionsExchangeTest extends GridCommonAbstr Ignite ignite1 = startGrid(1); - assertFalse(evtLatch0.await(1000, TimeUnit.MILLISECONDS)); + assertTrue(evtLatch0.await(1000, TimeUnit.MILLISECONDS)); ignite1.close(); - assertFalse(evtLatch0.await(1000, TimeUnit.MILLISECONDS)); + assertTrue(evtLatch0.await(1000, TimeUnit.MILLISECONDS)); ignite1 = startGrid(1); @@ -178,7 +178,7 @@ public class IgniteCacheClientNodePartitionsExchangeTest extends GridCommonAbstr } }, EventType.EVT_CACHE_REBALANCE_STARTED, EventType.EVT_CACHE_REBALANCE_STOPPED); - assertFalse(evtLatch0.await(1000, TimeUnit.MILLISECONDS)); + assertTrue(evtLatch0.await(1000, TimeUnit.MILLISECONDS)); client = false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c3ce158/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java index 4664c66..037af9d 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java @@ -136,6 +136,7 @@ public class IgniteCacheTestSuite2 extends TestSuite { suite.addTest(new TestSuite(IgniteCachePartitionMapUpdateTest.class)); suite.addTest(new TestSuite(IgniteCacheClientNodePartitionsExchangeTest.class)); suite.addTest(new TestSuite(IgniteCacheClientNodeChangingTopologyTest.class)); + suite.addTest(new TestSuite(IgniteCacheClientNodeConcurrentStart.class)); return suite; }