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 B8801187B9 for ; Fri, 24 Apr 2015 07:28:45 +0000 (UTC) Received: (qmail 26456 invoked by uid 500); 24 Apr 2015 07:28:45 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 26386 invoked by uid 500); 24 Apr 2015 07:28:45 -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 26370 invoked by uid 99); 24 Apr 2015 07:28:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 07:28:45 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 07:28:40 +0000 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 30A0224E9B for ; Fri, 24 Apr 2015 07:28:20 +0000 (UTC) Received: (qmail 21991 invoked by uid 99); 24 Apr 2015 07:27:05 -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, 24 Apr 2015 07:27:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 11435E0F7D; Fri, 24 Apr 2015 07:27:05 +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: Fri, 24 Apr 2015 07:27:20 -0000 Message-Id: In-Reply-To: <489f2b54d20849648fd9c2c025c29ca7@git.apache.org> References: <489f2b54d20849648fd9c2c025c29ca7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/50] incubator-ignite git commit: gg-10115: fix Client connector. X-Virus-Checked: Checked by ClamAV on apache.org gg-10115: fix Client connector. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8e31b7c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8e31b7c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8e31b7c3 Branch: refs/heads/ignite-710 Commit: 8e31b7c32c18ee641bfc6f5751a5acb4ba92375f Parents: 7c9fab3 Author: Artem Shutak Authored: Wed Apr 22 19:13:52 2015 +0300 Committer: Artem Shutak Committed: Wed Apr 22 19:13:52 2015 +0300 ---------------------------------------------------------------------- .../client/impl/connection/GridClientNioTcpConnection.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8e31b7c3/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java index 1f70385..d247e05 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientNioTcpConnection.java @@ -40,6 +40,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import java.util.logging.*; +import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.internal.client.GridClientCacheFlag.*; import static org.apache.ignite.internal.client.impl.connection.GridClientConnectionCloseReason.*; import static org.apache.ignite.internal.processors.rest.client.message.GridClientCacheRequest.GridCacheOperation.*; @@ -164,8 +165,12 @@ public class GridClientNioTcpConnection extends GridClientConnection { sock.setTcpNoDelay(tcpNoDelay); sock.setKeepAlive(true); + final long startConnTime = U.currentTimeMillis(); + sock.connect(srvAddr, connectTimeout); + final long connTimeoutRest = connectTimeout - (U.currentTimeMillis() - startConnTime); + GridClientFuture handshakeFut = new GridClientFutureAdapter<>(); Map meta = new HashMap<>(); @@ -199,7 +204,7 @@ public class GridClientNioTcpConnection extends GridClientConnection { ses.send(req); - handshakeFut.get(); + handshakeFut.get(connTimeoutRest, MILLISECONDS); ses.addMeta(SES_META_CONN, this); @@ -215,7 +220,7 @@ public class GridClientNioTcpConnection extends GridClientConnection { log.warning("Failed to send ping message: " + e); } } - }, 500, 500, TimeUnit.MILLISECONDS); + }, 500, 500, MILLISECONDS); createTs = System.currentTimeMillis();