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 0AC5718901 for ; Thu, 2 Jul 2015 17:41:03 +0000 (UTC) Received: (qmail 87337 invoked by uid 500); 2 Jul 2015 17:41:03 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 87305 invoked by uid 500); 2 Jul 2015 17:41:02 -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 87296 invoked by uid 99); 2 Jul 2015 17:41:02 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jul 2015 17:41:02 +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 78F9C1817A8 for ; Thu, 2 Jul 2015 17:41:02 +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-eu-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 cYUdlKVUEQ9o for ; Thu, 2 Jul 2015 17:40:55 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id A194D2531A for ; Thu, 2 Jul 2015 17:40:51 +0000 (UTC) Received: (qmail 86981 invoked by uid 99); 2 Jul 2015 17:40:51 -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, 02 Jul 2015 17:40:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 15FC5E3674; Thu, 2 Jul 2015 17:40:51 +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: Thu, 02 Jul 2015 17:40:57 -0000 Message-Id: <1a6e91ccf4c14b4e9d9948c751317913@git.apache.org> In-Reply-To: <52c250edcb364403a5e4443c07aad594@git.apache.org> References: <52c250edcb364403a5e4443c07aad594@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/8] incubator-ignite git commit: Merge branch 'ignite-648' into ignite-648-failover Merge branch 'ignite-648' into ignite-648-failover Conflicts: modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a3f9dc17 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a3f9dc17 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a3f9dc17 Branch: refs/heads/ignite-648-failover Commit: a3f9dc17d16a6d2bc7bb9e8a708b55ce2f534b66 Parents: d0b8b0d f53094f Author: ashutak Authored: Thu Jul 2 20:40:38 2015 +0300 Committer: ashutak Committed: Thu Jul 2 20:40:38 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheAbstractFullApiSelfTest.java | 5 +- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 3 ++ ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 13 ++++- .../near/GridCacheNearTxMultiNodeSelfTest.java | 13 +++-- ...achePartitionedMultiNodeCounterSelfTest.java | 6 +++ ...achePartitionedMultiNodeFullApiSelfTest.java | 18 ++++++- .../testframework/junits/GridAbstractTest.java | 55 +++++++++++++------- .../junits/common/GridCommonAbstractTest.java | 4 ++ .../multijvm/IgniteCacheProcessProxy.java | 8 ++- .../junits/multijvm/IgniteProcessProxy.java | 18 +++++++ 10 files changed, 113 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3f9dc17/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index d05c859,732af54..cd94bb9 --- 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 @@@ -775,26 -781,29 +781,30 @@@ public abstract class GridAbstractTest * @param cancel Cancel flag. */ protected void stopAllGrids(boolean cancel) { - Collection clients = new ArrayList<>(); - Collection srvs = new ArrayList<>(); - - for (Ignite g : G.allGrids()) { - if (g.configuration().getDiscoverySpi().isClientMode()) - clients.add(g); - else - srvs.add(g); - } + try { + Collection clients = new ArrayList<>(); + Collection srvs = new ArrayList<>(); + + for (Ignite g : G.allGrids()) { + if (g.configuration().getDiscoverySpi().isClientMode()) + clients.add(g); + else + srvs.add(g); + } - for (Ignite g : clients) - stopGrid(g.name(), cancel); + for (Ignite g : clients) + stopGrid(g.name(), cancel); - for (Ignite g : srvs) - stopGrid(g.name(), cancel); + for (Ignite g : srvs) + stopGrid(g.name(), cancel); - if (isMultiJvm()) + assert G.allGrids().isEmpty(); + } + finally { + IgniteProcessProxy.killAll(); // In multi jvm case. + IgniteNodeRunner.killAll(); + } - assert G.allGrids().isEmpty(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a3f9dc17/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java ----------------------------------------------------------------------