Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9B11D200BAE for ; Fri, 28 Oct 2016 14:17:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 99DF0160AE3; Fri, 28 Oct 2016 12:17:34 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C00F5160B0C for ; Fri, 28 Oct 2016 14:17:33 +0200 (CEST) Received: (qmail 50754 invoked by uid 500); 28 Oct 2016 12:17:33 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 50301 invoked by uid 99); 28 Oct 2016 12:17:32 -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; Fri, 28 Oct 2016 12:17:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7B564F1717; Fri, 28 Oct 2016 12:17:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Fri, 28 Oct 2016 12:17:47 -0000 Message-Id: <5cd1d91eb962413c99dbfe7864edac86@git.apache.org> In-Reply-To: <465d7c69d1384cb7b9a32b0904ccce81@git.apache.org> References: <465d7c69d1384cb7b9a32b0904ccce81@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/20] ignite git commit: IGNITE-2355 Fixed the test HadoopClientProtocolMultipleServersSelfTest. Clear connection poll before and after the test archived-at: Fri, 28 Oct 2016 12:17:34 -0000 IGNITE-2355 Fixed the test HadoopClientProtocolMultipleServersSelfTest. Clear connection poll before and after the test Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/551a4dfa Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/551a4dfa Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/551a4dfa Branch: refs/heads/ignite-4111 Commit: 551a4dfae6169a07a5e28f9b266f90311f3216b7 Parents: 7ed2bb7 Author: tledkov-gridgain Authored: Fri Oct 21 15:25:57 2016 +0500 Committer: tledkov-gridgain Committed: Fri Oct 21 15:25:57 2016 +0500 ---------------------------------------------------------------------- ...oopClientProtocolMultipleServersSelfTest.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/551a4dfa/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolMultipleServersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolMultipleServersSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolMultipleServersSelfTest.java index 51b6164..d6e0743 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolMultipleServersSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolMultipleServersSelfTest.java @@ -40,6 +40,7 @@ import org.apache.hadoop.mapreduce.Reducer; import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.mapreduce.lib.input.FileInputFormat; import org.apache.hadoop.mapreduce.lib.input.TextInputFormat; +import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteFileSystem; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.hadoop.mapreduce.IgniteHadoopClientProtocolProvider; @@ -81,6 +82,22 @@ public class HadoopClientProtocolMultipleServersSelfTest extends HadoopAbstractS @Override protected void afterTest() throws Exception { stopAllGrids(); + clearConnectionMap(); + + super.afterTest(); + } + + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + super.beforeTest(); + + clearConnectionMap(); + } + + /** + * @throws IgniteCheckedException If failed. + */ + private void clearConnectionMap() throws IgniteCheckedException { ConcurrentHashMap> cliMap = GridTestUtils.getFieldValue(IgniteHadoopClientProtocolProvider.class, "cliMap"); @@ -88,8 +105,6 @@ public class HadoopClientProtocolMultipleServersSelfTest extends HadoopAbstractS fut.get().close(); cliMap.clear(); - - super.afterTest(); } /** {@inheritDoc} */