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 2E0A710750 for ; Sun, 17 May 2015 19:37:39 +0000 (UTC) Received: (qmail 52800 invoked by uid 500); 17 May 2015 19:37:39 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 52769 invoked by uid 500); 17 May 2015 19:37:39 -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 52760 invoked by uid 99); 17 May 2015 19:37:39 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 May 2015 19:37:39 +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 8A45818393A for ; Sun, 17 May 2015 19:37:38 +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-us-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 gcjfATTkrGpx for ; Sun, 17 May 2015 19:37:37 +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 EF989262BE for ; Sun, 17 May 2015 19:37:23 +0000 (UTC) Received: (qmail 52137 invoked by uid 99); 17 May 2015 19:37:23 -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; Sun, 17 May 2015 19:37:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AC42FE05DD; Sun, 17 May 2015 19:37:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Date: Sun, 17 May 2015 19:37:47 -0000 Message-Id: <18b66981b3be4698a4387943df7ba878@git.apache.org> In-Reply-To: <17358fca37a844d59cb2671d821e58f7@git.apache.org> References: <17358fca37a844d59cb2671d821e58f7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/26] incubator-ignite git commit: # Return DFLT_NETWORK_TIMEOUT back to 5000ms. # Return DFLT_NETWORK_TIMEOUT back to 5000ms. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/68058988 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/68058988 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/68058988 Branch: refs/heads/ignite-709_2 Commit: 68058988ac76556b46807322eb20d53a5de19174 Parents: b468eeb Author: sevdokimov Authored: Sun May 17 21:48:47 2015 +0300 Committer: sevdokimov Committed: Sun May 17 21:48:47 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68058988/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 ffc0112..b4c90cf 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 @@ -55,8 +55,8 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov /** Default timeout for receiving message acknowledgement in milliseconds (value is 200ms). */ public static final long DFLT_ACK_TIMEOUT = 200; - /** Default network timeout in milliseconds (value is 200ms). */ - public static final long DFLT_NETWORK_TIMEOUT = 200; + /** Default network timeout in milliseconds (value is 5000ms). */ + public static final long DFLT_NETWORK_TIMEOUT = 5000; /** Default timeout for joining topology (value is 0). */ public static final long DFLT_JOIN_TIMEOUT = 0;