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 8313217AB0 for ; Fri, 15 May 2015 10:20:31 +0000 (UTC) Received: (qmail 57377 invoked by uid 500); 15 May 2015 10:20:31 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 57346 invoked by uid 500); 15 May 2015 10:20:31 -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 57337 invoked by uid 99); 15 May 2015 10:20:31 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 May 2015 10:20:31 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id DFF5BC0B1C for ; Fri, 15 May 2015 10:20:30 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-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 (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id D_GjNO4VOhvX for ; Fri, 15 May 2015 10:20:29 +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 C8DCE21784 for ; Fri, 15 May 2015 10:20:28 +0000 (UTC) Received: (qmail 57298 invoked by uid 99); 15 May 2015 10:20:28 -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, 15 May 2015 10:20:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C280EE10F7; Fri, 15 May 2015 10:20:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 15 May 2015 10:20:27 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/5] incubator-ignite git commit: Changed default timeout: SocketWrite, Ack and Network timeouts to 200. Repository: incubator-ignite Updated Branches: refs/heads/ignite-gg-10261 896b426bf -> 04774b5f2 Changed default timeout: SocketWrite, Ack and Network timeouts to 200. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de1c80e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de1c80e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de1c80e4 Branch: refs/heads/ignite-gg-10261 Commit: de1c80e4335f39a8888f6db3121b6f8afa6e5fb1 Parents: a4c9653 Author: nikolay_tikhonov Authored: Tue May 12 15:22:19 2015 +0300 Committer: nikolay_tikhonov Committed: Tue May 12 15:22:19 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/communication/tcp/TcpCommunicationSpi.java | 2 +- .../ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de1c80e4/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java index 2d5c541..fd17791 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java @@ -203,7 +203,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter public static final int DFLT_ACK_SND_THRESHOLD = 16; /** Default socket write timeout. */ - public static final long DFLT_SOCK_WRITE_TIMEOUT = GridNioServer.DFLT_SES_WRITE_TIMEOUT; + public static final long DFLT_SOCK_WRITE_TIMEOUT = 200; /** No-op runnable. */ private static final IgniteRunnable NOOP = new IgniteRunnable() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de1c80e4/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 5d28af2..b7e3cd5 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 @@ -54,11 +54,11 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov /** Default socket operations timeout in milliseconds (value is 200ms). */ public static final long DFLT_SOCK_TIMEOUT = 200; - /** Default timeout for receiving message acknowledgement in milliseconds (value is 5,000ms). */ - public static final long DFLT_ACK_TIMEOUT = 5000; + /** 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 5,000ms). */ - public static final long DFLT_NETWORK_TIMEOUT = 5000; + /** Default network timeout in milliseconds (value is 200ms). */ + public static final long DFLT_NETWORK_TIMEOUT = 200; /** Default value for thread priority (value is 10). */ public static final int DFLT_THREAD_PRI = 10;