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 93600183CA for ; Tue, 16 Jun 2015 13:55:17 +0000 (UTC) Received: (qmail 56467 invoked by uid 500); 16 Jun 2015 13:55:17 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 56436 invoked by uid 500); 16 Jun 2015 13:55:17 -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 56427 invoked by uid 99); 16 Jun 2015 13:55:17 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jun 2015 13:55:17 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id EE5F21A5680 for ; Tue, 16 Jun 2015 13:55:16 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-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 (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id bAf-9iwMyhdQ for ; Tue, 16 Jun 2015 13:55:09 +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 2F79E47C16 for ; Tue, 16 Jun 2015 13:55:09 +0000 (UTC) Received: (qmail 55754 invoked by uid 99); 16 Jun 2015 13:55:08 -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 13:55:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 93AB7DFF69; Tue, 16 Jun 2015 13:55:08 +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 13:55:08 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/5] incubator-ignite git commit: # ignite-883 fixed test # ignite-883 fixed 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/22ec5cf2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/22ec5cf2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/22ec5cf2 Branch: refs/heads/ignite-gg-dotnetclientmode Commit: 22ec5cf2a50ac7719ddc25ed5feb7ca06c491931 Parents: 54bfa36 Author: sboikov Authored: Tue Jun 16 15:58:53 2015 +0300 Committer: sboikov Committed: Tue Jun 16 15:58:53 2015 +0300 ---------------------------------------------------------------------- .../IgniteCacheClientNodeConcurrentStart.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ec5cf2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java index bd74ece..1eff7fb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeConcurrentStart.java @@ -37,7 +37,7 @@ public class IgniteCacheClientNodeConcurrentStart extends GridCommonAbstractTest protected static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** */ - private static final int NODES_CNT = 5; + private static final int NODES_CNT = 6; /** */ private Set clientNodes; @@ -83,13 +83,21 @@ public class IgniteCacheClientNodeConcurrentStart extends GridCommonAbstractTest clientNodes = new HashSet<>(); while (clientNodes.size() < 2) - clientNodes.add(rnd.nextInt(0, NODES_CNT)); + clientNodes.add(rnd.nextInt(1, NODES_CNT)); clientNodes.add(NODES_CNT - 1); log.info("Test iteration [iter=" + i + ", clients=" + clientNodes + ']'); - startGridsMultiThreaded(NODES_CNT, true); + Ignite srv = startGrid(0); // Start server node first. + + assertFalse(srv.configuration().isClientMode()); + + startGridsMultiThreaded(1, NODES_CNT - 1); + + checkTopology(NODES_CNT); + + awaitPartitionMapExchange(); for (int node : clientNodes) { Ignite ignite = grid(node);