You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/15 11:17:07 UTC

[1/5] incubator-ignite git commit: Changed default timeout: SocketWrite, Ack and Network timeouts to 200.

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-sprint-5 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-sprint-5
Commit: de1c80e4335f39a8888f6db3121b6f8afa6e5fb1
Parents: a4c9653
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue May 12 15:22:19 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
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 <tt>200ms</tt>). */
     public static final long DFLT_SOCK_TIMEOUT = 200;
 
-    /** Default timeout for receiving message acknowledgement in milliseconds (value is <tt>5,000ms</tt>). */
-    public static final long DFLT_ACK_TIMEOUT = 5000;
+    /** Default timeout for receiving message acknowledgement in milliseconds (value is <tt>200ms</tt>). */
+    public static final long DFLT_ACK_TIMEOUT = 200;
 
-    /** Default network timeout in milliseconds (value is <tt>5,000ms</tt>). */
-    public static final long DFLT_NETWORK_TIMEOUT = 5000;
+    /** Default network timeout in milliseconds (value is <tt>200ms</tt>). */
+    public static final long DFLT_NETWORK_TIMEOUT = 200;
 
     /** Default value for thread priority (value is <tt>10</tt>). */
     public static final int DFLT_THREAD_PRI = 10;


[3/5] incubator-ignite git commit: 775 perm to sh files

Posted by sb...@apache.org.
775 perm to sh files


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a8a0062f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a8a0062f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a8a0062f

Branch: refs/heads/ignite-sprint-5
Commit: a8a0062f0a13d008204ce015aa2526d609a3776f
Parents: b95d2ae
Author: avinogradov <av...@gridgain.com>
Authored: Tue May 12 20:07:18 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Tue May 12 20:07:18 2015 +0300

----------------------------------------------------------------------
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a8a0062f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0643227..cb790bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -300,6 +300,8 @@
                                             <substitution expression="${project.version}" />
                                         </replaceregexp>
 
+                                        <chmod dir="${basedir}/target/release-package" perm="755" includes="**/*.sh"/>
+
                                         <zip destfile="${basedir}/target/bin/${ignite.zip.pattern}.zip" encoding="UTF-8">
                                             <zipfileset dir="${basedir}/target/release-package" prefix="${ignite.zip.pattern}" filemode="755">
                                                 <include name="**/*.sh" />


[5/5] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-5

Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-sprint-5


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/04774b5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/04774b5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/04774b5f

Branch: refs/heads/ignite-sprint-5
Commit: 04774b5f2e2df2f83bef66d1a1c686662ebee04d
Parents: 896b426 9c30fba
Author: avinogradov <av...@gridgain.com>
Authored: Fri May 15 12:12:02 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Fri May 15 12:12:02 2015 +0300

----------------------------------------------------------------------
 .../ignite/spi/communication/tcp/TcpCommunicationSpi.java    | 2 +-
 .../ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java     | 8 ++++----
 pom.xml                                                      | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04774b5f/pom.xml
----------------------------------------------------------------------


[4/5] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4

Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-4' into ignite-sprint-4


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9c30fba4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9c30fba4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9c30fba4

Branch: refs/heads/ignite-sprint-5
Commit: 9c30fba4d817c1ac8b16351b29163a5eaec6d7d5
Parents: a8a0062 478cc7b
Author: avinogradov <av...@gridgain.com>
Authored: Tue May 12 20:07:39 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Tue May 12 20:07:39 2015 +0300

----------------------------------------------------------------------
 .../ignite/spi/communication/tcp/TcpCommunicationSpi.java    | 2 +-
 .../ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------



[2/5] incubator-ignite git commit: Merge branch 'ignite-timeout' into ignite-sprint-4

Posted by sb...@apache.org.
Merge branch 'ignite-timeout' into ignite-sprint-4


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/478cc7bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/478cc7bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/478cc7bf

Branch: refs/heads/ignite-sprint-5
Commit: 478cc7bfe8a507982ac0ad9fd7d3370d19a936fa
Parents: b95d2ae de1c80e
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Tue May 12 17:46:50 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Tue May 12 17:46:50 2015 +0300

----------------------------------------------------------------------
 .../ignite/spi/communication/tcp/TcpCommunicationSpi.java    | 2 +-
 .../ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------