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 B72671853B for ; Thu, 16 Jul 2015 15:50:57 +0000 (UTC) Received: (qmail 15747 invoked by uid 500); 16 Jul 2015 15:50:57 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 15713 invoked by uid 500); 16 Jul 2015 15:50:57 -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 15703 invoked by uid 99); 16 Jul 2015 15:50:57 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jul 2015 15:50:57 +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 37D35D5224 for ; Thu, 16 Jul 2015 15:50:57 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.484 X-Spam-Level: X-Spam-Status: No, score=0.484 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.317, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id EaKZYAdWJ8J4 for ; Thu, 16 Jul 2015 15:50:42 +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 D31E725073 for ; Thu, 16 Jul 2015 15:50:41 +0000 (UTC) Received: (qmail 14703 invoked by uid 99); 16 Jul 2015 15:50:41 -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; Thu, 16 Jul 2015 15:50:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 59C67E6812; Thu, 16 Jul 2015 15:50:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ivasilinets@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 16 Jul 2015 15:50:47 -0000 Message-Id: <11604e74fc294df0b24df610c4b93591@git.apache.org> In-Reply-To: <2634c240f2054ab2b85630bb68d42464@git.apache.org> References: <2634c240f2054ab2b85630bb68d42464@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/36] incubator-ignite git commit: ignite-890: fixing ignite-890: fixing Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e25d5b11 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e25d5b11 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e25d5b11 Branch: refs/heads/ignite-961 Commit: e25d5b11cb08ba7fcb0a64721603de3f8c50aa28 Parents: dce50db Author: Denis Magda Authored: Mon Jul 13 14:01:46 2015 +0300 Committer: Denis Magda Committed: Mon Jul 13 14:01:46 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 4 ++++ .../spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java | 8 ++++---- .../ignite/testframework/junits/GridAbstractTest.java | 10 ++++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e25d5b11/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index ff33efa..33abe55 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -1710,6 +1710,8 @@ class ServerImpl extends TcpDiscoveryImpl { if (res != null && msg.verified()) res.add(prepare(msg, node.id())); + else + log.info("(1) Skipping message with [topVer=" + msg.topologyVersion() + ", msg=" + msg + ']'); } if (log.isDebugEnabled()) { @@ -1736,6 +1738,8 @@ class ServerImpl extends TcpDiscoveryImpl { } else if (msg.verified()) cp.add(prepare(msg, node.id())); + else + log.info("(2) Skipping message with [topVer=" + msg.topologyVersion() + ", msg=" + msg + ']'); } cp = !skip ? cp : null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e25d5b11/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java index b291b9c..cd07341 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java @@ -37,10 +37,10 @@ import static org.apache.ignite.events.EventType.*; */ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { /** */ - private static final int GRID_CNT = 3; + private static final int GRID_CNT = 4; /** */ - private static final int CLIENT_GRID_CNT = 2; + private static final int CLIENT_GRID_CNT = 1; /** */ private static final ThreadLocal clientFlagPerThread = new ThreadLocal<>(); @@ -185,7 +185,7 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { int idx = clientIdx.getAndIncrement(); while (!done.get()) { - stopGrid(idx); + assertTrue(stopGrid(idx, true)); startGrid(idx); } @@ -208,7 +208,7 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { while (!done.get()) { int idx = srvIdx.take(); - stopGrid(idx); + assertTrue(stopGrid(idx, true)); startGrid(idx); srvIdx.add(idx); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e25d5b11/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 06a1523..29d204e 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -1022,9 +1022,11 @@ public abstract class GridAbstractTest extends TestCase { * @param cancel Cancel flag. */ @SuppressWarnings("deprecation") - protected void stopGrid(int idx, boolean cancel) { + protected boolean stopGrid(int idx, boolean cancel) { String gridName = getTestGridName(idx); + boolean res; + try { Ignite ignite = G.ignite(gridName); @@ -1032,16 +1034,20 @@ public abstract class GridAbstractTest extends TestCase { info(">>> Stopping grid [name=" + ignite.name() + ", id=" + ignite.cluster().localNode().id() + ']'); - G.stop(gridName, cancel); + res = G.stop(gridName, cancel); } catch (IllegalStateException ignored) { // Ignore error if grid already stopped. + res = true; } catch (Throwable e) { error("Failed to stop grid [gridName=" + gridName + ", cancel=" + cancel + ']', e); stopGridErr = true; + res = false; } + + return res; } /**