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 AC29E10CA5 for ; Tue, 19 May 2015 19:40:09 +0000 (UTC) Received: (qmail 8622 invoked by uid 500); 19 May 2015 19:40:09 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 8592 invoked by uid 500); 19 May 2015 19:40:09 -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 8583 invoked by uid 99); 19 May 2015 19:40:09 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 May 2015 19:40:09 +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 22E54182929 for ; Tue, 19 May 2015 19:40:09 +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 pvwQy5rt75c8 for ; Tue, 19 May 2015 19:39: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 69F8B25330 for ; Tue, 19 May 2015 19:39:54 +0000 (UTC) Received: (qmail 7207 invoked by uid 99); 19 May 2015 19:39:53 -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, 19 May 2015 19:39:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7C4D2E35AA; Tue, 19 May 2015 19:39:53 +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: Tue, 19 May 2015 19:39:54 -0000 Message-Id: <72cb113641e14715975e67bcb684a2f6@git.apache.org> In-Reply-To: <335a0c38e0c24299b23f31e813c0b631@git.apache.org> References: <335a0c38e0c24299b23f31e813c0b631@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/11] incubator-ignite git commit: # IGNITE-709 Bug fix: check (joinTimeout > 0) # IGNITE-709 Bug fix: check (joinTimeout > 0) Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f265cb68 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f265cb68 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f265cb68 Branch: refs/heads/ignite-23 Commit: f265cb68d108d5b3617f5d6f893f477ca2308bff Parents: 9bbc1fe Author: sevdokimov Authored: Mon May 18 17:14:23 2015 +0300 Committer: sevdokimov Committed: Mon May 18 17:14:23 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java | 4 ++-- .../apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f265cb68/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java index 6062ce5..5573f51 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java @@ -507,7 +507,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp else { U.warn(log, "No addresses registered in the IP finder (will retry in 2000ms): " + ipFinder); - if ((U.currentTimeMillis() - startTime) > joinTimeout) + if (joinTimeout > 0 && (U.currentTimeMillis() - startTime) > joinTimeout) return null; Thread.sleep(2000); @@ -581,7 +581,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp U.warn(log, "Failed to connect to any address from IP finder (will retry to join topology " + "in 2000ms): " + addrs0); - if ((U.currentTimeMillis() - startTime) > joinTimeout) + if (joinTimeout > 0 && (U.currentTimeMillis() - startTime) > joinTimeout) return null; Thread.sleep(2000); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f265cb68/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java index 3c3b984..a89dbcc 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java @@ -150,7 +150,6 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov assertParameter(netTimeout > 0, "networkTimeout > 0"); assertParameter(sockTimeout > 0, "sockTimeout > 0"); assertParameter(ackTimeout > 0, "ackTimeout > 0"); - assertParameter(joinTimeout >= 0, "joinTimeout >= 0"); } /**