You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/06/19 04:55:24 UTC
[01/14] incubator-ignite git commit: sprint-6 - ignite-indexing
module check
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-7 edc9a1c4b -> 9458f1255
sprint-6 - ignite-indexing module check
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c1eee186
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c1eee186
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c1eee186
Branch: refs/heads/ignite-sprint-7
Commit: c1eee18615be56c7bb60d34614451612710b6cef
Parents: d874b00
Author: S.Vladykin <sv...@gridgain.com>
Authored: Thu Jun 18 13:39:19 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Thu Jun 18 13:39:19 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 5 +++++
.../ignite/internal/processors/query/GridQueryProcessor.java | 7 +++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1eee186/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 0d70792..48fd259 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -556,6 +556,11 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V
!(qry instanceof ContinuousQuery))
throw new CacheException("Indexing is disabled for cache: " + ctx.cache().name() +
". Use setIndexedTypes or setTypeMetadata methods on CacheConfiguration to enable.");
+
+ if (!ctx.kernalContext().query().moduleEnabled() &&
+ (qry instanceof SqlQuery || qry instanceof SqlFieldsQuery || qry instanceof TextQuery))
+ throw new CacheException("Failed to execute query. Add module 'ignite-indexing' to the classpath " +
+ "of all Ignite nodes.");
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c1eee186/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 4f2486b..e080c6d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -107,6 +107,13 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}
/**
+ * @return {@code true} If indexing module is in classpath and successfully initialized.
+ */
+ public boolean moduleEnabled() {
+ return idx != null;
+ }
+
+ /**
* @param ccfg Cache configuration.
* @throws IgniteCheckedException If failed.
*/
[10/14] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1003' into ignite-sprint-6
Posted by ak...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-1003' into ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4d1fa723
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4d1fa723
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4d1fa723
Branch: refs/heads/ignite-sprint-7
Commit: 4d1fa7235c1381bacaaeaf458658675d2ba34923
Parents: 31cf802 b23f930
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jun 18 15:15:49 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jun 18 15:15:49 2015 +0300
----------------------------------------------------------------------
.../communication/tcp/TcpCommunicationSpi.java | 38 ++++++++++----------
.../ignite/spi/discovery/tcp/ServerImpl.java | 21 +++++++----
.../spi/discovery/tcp/TcpDiscoverySpi.java | 9 ++++-
.../tcp/internal/TcpDiscoveryNode.java | 18 ++++++++++
4 files changed, 60 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d1fa723/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d1fa723/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d1fa723/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
[08/14] incubator-ignite git commit: # changed discovery error message
Posted by ak...@apache.org.
# changed discovery error message
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/31cf8027
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/31cf8027
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/31cf8027
Branch: refs/heads/ignite-sprint-7
Commit: 31cf8027216afca3d02461caa4f4245bdd8d0e73
Parents: cb862b6
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Jun 18 14:56:12 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Jun 18 14:56:12 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/31cf8027/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 63f165d..e9a949a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -4103,8 +4103,14 @@ class ServerImpl extends TcpDiscoveryImpl {
if (U.isMacInvalidArgumentError(e))
LT.error(log, e, "Failed to initialize connection [sock=" + sock + "]\n\t" +
U.MAC_INVALID_ARG_MSG);
- else
- LT.error(log, e, "Failed to initialize connection [sock=" + sock + ']');
+ else {
+ U.error(
+ log,
+ "Failed to initialize connection (this can happen due to short time " +
+ "network problems and can be ignored if does not affect node discovery) " +
+ "[sock=" + sock + ']',
+ e);
+ }
}
onException("Caught exception on handshake [err=" + e + ", sock=" + sock + ']', e);
[05/14] incubator-ignite git commit: # ignite-sprint-6 disabled shmem
for test
Posted by ak...@apache.org.
# ignite-sprint-6 disabled shmem for test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca81476d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca81476d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca81476d
Branch: refs/heads/ignite-sprint-7
Commit: ca81476d1ab66773815c7e3f91d61ea5b0651bb9
Parents: b23ea74
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jun 18 14:21:34 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jun 18 14:21:34 2015 +0300
----------------------------------------------------------------------
.../datastreamer/DataStreamerMultiThreadedSelfTest.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca81476d/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
index e0092d4..c37219a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerMultiThreadedSelfTest.java
@@ -22,6 +22,7 @@ import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
+import org.apache.ignite.spi.communication.tcp.*;
import org.apache.ignite.spi.discovery.tcp.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
@@ -48,6 +49,8 @@ public class DataStreamerMultiThreadedSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+ ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
+
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
discoSpi.setIpFinder(IP_FINDER);
[12/14] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-6' into ignite-sprint-6
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8c404f78
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8c404f78
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8c404f78
Branch: refs/heads/ignite-sprint-7
Commit: 8c404f78cc264ddf43c71904b9fbac40ce0ee418
Parents: 4f3292d 4d1fa72
Author: nikolay tikhonov <nt...@gridgain.com>
Authored: Thu Jun 18 15:19:58 2015 +0300
Committer: nikolay tikhonov <nt...@gridgain.com>
Committed: Thu Jun 18 15:19:58 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheUtils.java | 9 +++++
.../processors/cache/IgniteCacheProxy.java | 5 +++
.../processors/query/GridQueryProcessor.java | 7 ++++
.../communication/tcp/TcpCommunicationSpi.java | 42 ++++++++++----------
.../ignite/spi/discovery/tcp/ServerImpl.java | 31 +++++++++++----
.../spi/discovery/tcp/TcpDiscoverySpi.java | 41 +++++++++++++------
.../tcp/internal/TcpDiscoveryNode.java | 18 +++++++++
.../DataStreamerMultiThreadedSelfTest.java | 3 ++
8 files changed, 115 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
[11/14] incubator-ignite git commit: Fixed test.
Posted by ak...@apache.org.
Fixed test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4f3292d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4f3292d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4f3292d5
Branch: refs/heads/ignite-sprint-7
Commit: 4f3292d5d8b29c04fcc1bf1fa9b88e5f19ceddfe
Parents: d874b00
Author: nikolay tikhonov <nt...@gridgain.com>
Authored: Thu Jun 18 15:19:03 2015 +0300
Committer: nikolay tikhonov <nt...@gridgain.com>
Committed: Thu Jun 18 15:19:03 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/GridSelfTest.java | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f3292d5/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
index eccae34..2de04b0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
@@ -112,7 +112,9 @@ public class GridSelfTest extends GridProjectionAbstractTest {
*/
@SuppressWarnings({"TooBroadScope"})
public void testAsyncListen() throws Exception {
- final String msg = "HELLO!";
+ final String hello = "HELLO!";
+
+ final String bye = "BYE!";
final Ignite g = grid(0);
@@ -120,10 +122,12 @@ public class GridSelfTest extends GridProjectionAbstractTest {
g.message().remoteListen(null, new MessagingListenActor<String>() {
@Override protected void receive(UUID nodeId, String rcvMsg) throws Throwable {
- assertEquals(locNodeId, nodeId);
- assertEquals(msg, rcvMsg);
+ if (hello.equals(rcvMsg)) {
+ assertEquals(locNodeId, nodeId);
+ assertEquals(hello, rcvMsg);
- stop(rcvMsg);
+ stop(bye);
+ }
}
});
@@ -131,22 +135,22 @@ public class GridSelfTest extends GridProjectionAbstractTest {
g.message().localListen(null, new P2<UUID, String>() {
@Override public boolean apply(UUID nodeId, String msg) {
- if (!locNodeId.equals(nodeId))
+ if (msg.equals(bye))
cnt.incrementAndGet();
return true;
}
});
- g.message().send(null, msg);
+ g.message().send(null, hello);
GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
- return cnt.get() == g.cluster().forRemotes().nodes().size();
+ return cnt.get() == g.cluster().nodes().size();
}
}, 5000);
- assertEquals(cnt.get(), g.cluster().forRemotes().nodes().size());
+ assertEquals(cnt.get(), g.cluster().nodes().size());
}
/**
[14/14] incubator-ignite git commit: Merge branch 'ignite-sprint-6'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-sprint-7
Posted by ak...@apache.org.
Merge branch 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-7
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9458f125
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9458f125
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9458f125
Branch: refs/heads/ignite-sprint-7
Commit: 9458f12554579fd71a26f56d7bf191d0ec51173e
Parents: edc9a1c ad0a026
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Jun 19 09:55:02 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Jun 19 09:55:02 2015 +0700
----------------------------------------------------------------------
.../processors/cache/GridCacheUtils.java | 9 +++++
.../processors/cache/IgniteCacheProxy.java | 5 +++
.../processors/query/GridQueryProcessor.java | 7 ++++
.../communication/tcp/TcpCommunicationSpi.java | 42 ++++++++++----------
.../ignite/spi/discovery/tcp/ServerImpl.java | 35 ++++++++++++----
.../spi/discovery/tcp/TcpDiscoverySpi.java | 42 ++++++++++++++------
.../tcp/internal/TcpDiscoveryNode.java | 18 +++++++++
.../apache/ignite/internal/GridSelfTest.java | 20 ++++++----
.../DataStreamerMultiThreadedSelfTest.java | 3 ++
9 files changed, 132 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
[06/14] incubator-ignite git commit: # changed defaults for discovery
Posted by ak...@apache.org.
# changed defaults for discovery
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5011c2b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5011c2b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5011c2b5
Branch: refs/heads/ignite-sprint-7
Commit: 5011c2b5e9671ced95e21f122c2e5ef9102c19fe
Parents: b23ea74
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Jun 18 14:50:43 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Jun 18 14:50:43 2015 +0300
----------------------------------------------------------------------
.../communication/tcp/TcpCommunicationSpi.java | 6 ++--
.../spi/discovery/tcp/TcpDiscoverySpi.java | 32 +++++++++++++-------
2 files changed, 24 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5011c2b5/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 9e38788..fc504f4 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
@@ -174,8 +174,8 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** Default socket send and receive buffer size. */
public static final int DFLT_SOCK_BUF_SIZE = 32 * 1024;
- /** Default connection timeout (value is <tt>1000</tt>ms). */
- public static final long DFLT_CONN_TIMEOUT = 1000;
+ /** Default connection timeout (value is <tt>5000</tt>ms). */
+ public static final long DFLT_CONN_TIMEOUT = 5000;
/** Default Maximum connection timeout (value is <tt>600,000</tt>ms). */
public static final long DFLT_MAX_CONN_TIMEOUT = 10 * 60 * 1000;
@@ -680,7 +680,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** Recovery and idle clients handler. */
private CommunicationWorker commWorker;
-
+
/** Shared memory accept worker. */
private ShmemAcceptWorker shmemAcceptWorker;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5011c2b5/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index e4ef744..9a26867 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -21,7 +21,6 @@ import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.util.*;
import org.apache.ignite.internal.util.io.*;
import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.*;
@@ -66,6 +65,17 @@ import java.util.concurrent.atomic.*;
* and then this info goes to coordinator. When coordinator processes join request
* and issues node added messages and all other nodes then receive info about new node.
* <h1 class="header">Configuration</h1>
+ * <h2 class="header">Important Notice</h2>
+ * Configuration defaults are chosen to make possible for discovery SPI to reliably work on
+ * most of hardware and virtual deployments, but this has made failure detection time worse.
+ * <p>
+ * For stable low-latency networks the following more aggressive settings are recommended
+ * (which allows failure detection time ~200ms):
+ * <ul>
+ * <li>Heartbeat frequency (see {@link #setHeartbeatFrequency(long)}) - 100ms</li>
+ * <li>Socket timeout (see {@link #setSocketTimeout(long)}) - 200ms</li>
+ * <li>Message acknowledgement timeout (see {@link #setAckTimeout(long)}) - 50ms</li>
+ * </ul>
* <h2 class="header">Mandatory</h2>
* There are no mandatory configuration parameters.
* <h2 class="header">Optional</h2>
@@ -164,23 +174,23 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
/** Default value for thread priority (value is <tt>10</tt>). */
public static final int DFLT_THREAD_PRI = 10;
- /** Default heartbeat messages issuing frequency (value is <tt>100ms</tt>). */
- public static final long DFLT_HEARTBEAT_FREQ = 100;
+ /** Default heartbeat messages issuing frequency (value is <tt>2000ms</tt>). */
+ public static final long DFLT_HEARTBEAT_FREQ = 2000;
/** Default size of topology snapshots history. */
public static final int DFLT_TOP_HISTORY_SIZE = 1000;
- /** Default socket operations timeout in milliseconds (value is <tt>200ms</tt>). */
- public static final long DFLT_SOCK_TIMEOUT = 200;
+ /** Default socket operations timeout in milliseconds (value is <tt>5000ms</tt>). */
+ public static final long DFLT_SOCK_TIMEOUT = 5000;
- /** Default timeout for receiving message acknowledgement in milliseconds (value is <tt>50ms</tt>). */
- public static final long DFLT_ACK_TIMEOUT = 50;
+ /** Default timeout for receiving message acknowledgement in milliseconds (value is <tt>5000ms</tt>). */
+ public static final long DFLT_ACK_TIMEOUT = 5000;
- /** Default socket operations timeout in milliseconds (value is <tt>700ms</tt>). */
- public static final long DFLT_SOCK_TIMEOUT_CLIENT = 700;
+ /** Default socket operations timeout in milliseconds (value is <tt>5000ms</tt>). */
+ public static final long DFLT_SOCK_TIMEOUT_CLIENT = 5000;
- /** Default timeout for receiving message acknowledgement in milliseconds (value is <tt>700ms</tt>). */
- public static final long DFLT_ACK_TIMEOUT_CLIENT = 700;
+ /** Default timeout for receiving message acknowledgement in milliseconds (value is <tt>5000ms</tt>). */
+ public static final long DFLT_ACK_TIMEOUT_CLIENT = 5000;
/** Default reconnect attempts count (value is <tt>10</tt>). */
public static final int DFLT_RECONNECT_CNT = 10;
[04/14] incubator-ignite git commit: # ignite-1003 add
lastSuccessfulAddr for ping
Posted by ak...@apache.org.
# ignite-1003 add lastSuccessfulAddr for ping
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b23f9300
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b23f9300
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b23f9300
Branch: refs/heads/ignite-sprint-7
Commit: b23f9300794c7e84dfc83c1b8e49de673fa354e1
Parents: d874b00
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jun 18 13:52:45 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jun 18 13:52:45 2015 +0300
----------------------------------------------------------------------
.../communication/tcp/TcpCommunicationSpi.java | 38 ++++++++++----------
.../ignite/spi/discovery/tcp/ServerImpl.java | 21 +++++++----
.../spi/discovery/tcp/TcpDiscoverySpi.java | 9 ++++-
.../tcp/internal/TcpDiscoveryNode.java | 18 ++++++++++
4 files changed, 60 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b23f9300/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 9e38788..39f4eeb 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
@@ -267,23 +267,19 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
if (!isNodeStopping()) {
GridNioRecoveryDescriptor recoveryData = ses.recoveryDescriptor();
- if (!getSpiContext().tryFailNode(id)) {
- if (recoveryData != null) {
- if (recoveryData.nodeAlive(getSpiContext().node(id))) {
- if (!recoveryData.messagesFutures().isEmpty()) {
- if (log.isDebugEnabled())
- log.debug("Session was closed but there are unacknowledged messages, " +
- "will try to reconnect [rmtNode=" + recoveryData.node().id() + ']');
-
- commWorker.addReconnectRequest(recoveryData);
- }
+ if (recoveryData != null) {
+ if (recoveryData.nodeAlive(getSpiContext().node(id))) {
+ if (!recoveryData.messagesFutures().isEmpty()) {
+ if (log.isDebugEnabled())
+ log.debug("Session was closed but there are unacknowledged messages, " +
+ "will try to reconnect [rmtNode=" + recoveryData.node().id() + ']');
+
+ commWorker.addReconnectRequest(recoveryData);
}
- else
- recoveryData.onNodeLeft();
}
+ else
+ recoveryData.onNodeLeft();
}
- else
- recoveryData.onNodeLeft();
}
}
@@ -1884,18 +1880,20 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
"TCP communication addresses or mapped external addresses. Check configuration and make sure " +
"that you use the same communication SPI on all nodes. Remote node id: " + node.id());
- List<InetSocketAddress> addrs;
+ LinkedHashSet<InetSocketAddress> addrs;
// Try to connect first on bound addresses.
if (isRmtAddrsExist) {
- addrs = new ArrayList<>(U.toSocketAddresses(rmtAddrs0, rmtHostNames0, boundPort));
+ List<InetSocketAddress> addrs0 = new ArrayList<>(U.toSocketAddresses(rmtAddrs0, rmtHostNames0, boundPort));
boolean sameHost = U.sameMacs(getSpiContext().localNode(), node);
- Collections.sort(addrs, U.inetAddressesComparator(sameHost));
+ Collections.sort(addrs0, U.inetAddressesComparator(sameHost));
+
+ addrs = new LinkedHashSet<>(addrs0);
}
else
- addrs = new ArrayList<>();
+ addrs = new LinkedHashSet<>();
// Then on mapped external addresses.
if (isExtAddrsExist)
@@ -2610,7 +2608,9 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
private void processRecovery(GridNioRecoveryDescriptor recoveryDesc) {
ClusterNode node = recoveryDesc.node();
- if (clients.containsKey(node.id()) || !recoveryDesc.nodeAlive(getSpiContext().node(node.id())))
+ if (clients.containsKey(node.id()) ||
+ !recoveryDesc.nodeAlive(getSpiContext().node(node.id())) ||
+ !getSpiContext().pingNode(node.id()))
return;
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b23f9300/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 63f165d..8a9553e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -440,7 +440,12 @@ class ServerImpl extends TcpDiscoveryImpl {
// ID returned by the node should be the same as ID of the parameter for ping to succeed.
IgniteBiTuple<UUID, Boolean> t = pingNode(addr, clientNodeId);
- return node.id().equals(t.get1()) && (clientNodeId == null || t.get2());
+ boolean res = node.id().equals(t.get1()) && (clientNodeId == null || t.get2());
+
+ if (res)
+ node.lastSuccessfulAddress(addr);
+
+ return res;
}
catch (IgniteCheckedException e) {
if (log.isDebugEnabled())
@@ -458,8 +463,9 @@ class ServerImpl extends TcpDiscoveryImpl {
* Pings the node by its address to see if it's alive.
*
* @param addr Address of the node.
+ * @param clientNodeId Client node ID.
* @return ID of the remote node and "client exists" flag if node alive.
- * @throws IgniteSpiException If an error occurs.
+ * @throws IgniteCheckedException If an error occurs.
*/
private IgniteBiTuple<UUID, Boolean> pingNode(InetSocketAddress addr, @Nullable UUID clientNodeId)
throws IgniteCheckedException {
@@ -1589,8 +1595,7 @@ class ServerImpl extends TcpDiscoveryImpl {
regAddrs,
F.notContains(currAddrs),
new P1<InetSocketAddress>() {
- private final Map<InetSocketAddress, Boolean> pingResMap =
- new HashMap<>();
+ private final Map<InetSocketAddress, Boolean> pingResMap = new HashMap<>();
@Override public boolean apply(InetSocketAddress addr) {
Boolean res = pingResMap.get(addr);
@@ -2092,6 +2097,8 @@ class ServerImpl extends TcpDiscoveryImpl {
errs = null;
success = true;
+
+ next.lastSuccessfulAddress(addr);
}
}
catch (IOException | IgniteCheckedException e) {
@@ -2672,6 +2679,8 @@ class ServerImpl extends TcpDiscoveryImpl {
try {
sendMessageDirectly(msg, addr);
+ node.lastSuccessfulAddress(addr);
+
ex = null;
break;
@@ -4588,7 +4597,7 @@ class ServerImpl extends TcpDiscoveryImpl {
}
/**
- *
+ * @param res Ping result.
*/
public void pingResult(boolean res) {
GridFutureAdapter<Boolean> fut = pingFut.getAndSet(null);
@@ -4598,7 +4607,7 @@ class ServerImpl extends TcpDiscoveryImpl {
}
/**
- *
+ * @throws InterruptedException If interrupted.
*/
public boolean ping() throws InterruptedException {
if (spi.isNodeStopping0())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b23f9300/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index e4ef744..baada21 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -892,7 +892,14 @@ public class TcpDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, T
Collections.sort(addrs, U.inetAddressesComparator(sameHost));
- LinkedHashSet<InetSocketAddress> res = new LinkedHashSet<>(addrs);
+ LinkedHashSet<InetSocketAddress> res = new LinkedHashSet<>();
+
+ InetSocketAddress lastAddr = node.lastSuccessfulAddress();
+
+ if (lastAddr != null)
+ res.add(lastAddr);
+
+ res.addAll(addrs);
Collection<InetSocketAddress> extAddrs = node.attribute(createSpiAttributeName(ATTR_EXT_ADDRS));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b23f9300/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
index cc61c9d..36ae39e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
@@ -111,6 +111,10 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
@GridToStringExclude
private UUID clientRouterNodeId;
+ /** */
+ @GridToStringExclude
+ private volatile transient InetSocketAddress lastSuccessfulAddr;
+
/**
* Public default no-arg constructor for {@link Externalizable} interface.
*/
@@ -152,6 +156,20 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste
sockAddrs = U.toSocketAddresses(this, discPort);
}
+ /**
+ * @return Last successfully connected address.
+ */
+ @Nullable public InetSocketAddress lastSuccessfulAddress() {
+ return lastSuccessfulAddr;
+ }
+
+ /**
+ * @param lastSuccessfulAddr Last successfully connected address.
+ */
+ public void lastSuccessfulAddress(InetSocketAddress lastSuccessfulAddr) {
+ this.lastSuccessfulAddr = lastSuccessfulAddr;
+ }
+
/** {@inheritDoc} */
@Override public UUID id() {
return id;
[13/14] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-6' into ignite-sprint-6
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ad0a026f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ad0a026f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ad0a026f
Branch: refs/heads/ignite-sprint-7
Commit: ad0a026f480ff67025b39737c2e068b20035feb6
Parents: fc81bcf 8c404f7
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Jun 18 15:54:59 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Jun 18 15:54:59 2015 +0300
----------------------------------------------------------------------
.../communication/tcp/TcpCommunicationSpi.java | 38 ++++++++++----------
.../ignite/spi/discovery/tcp/ServerImpl.java | 21 +++++++----
.../spi/discovery/tcp/TcpDiscoverySpi.java | 9 ++++-
.../tcp/internal/TcpDiscoveryNode.java | 18 ++++++++++
.../apache/ignite/internal/GridSelfTest.java | 20 ++++++-----
5 files changed, 72 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad0a026f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad0a026f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
[09/14] incubator-ignite git commit: # disco spi usability - doc and
warning messages on failure detection speed up
Posted by ak...@apache.org.
# disco spi usability - doc and warning messages on failure detection speed up
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fc81bcfd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fc81bcfd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fc81bcfd
Branch: refs/heads/ignite-sprint-7
Commit: fc81bcfd0a4fd20e4322a060d7745754f14767e1
Parents: 31cf802
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Jun 18 15:08:33 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Jun 18 15:08:33 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 4 ++++
.../org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 7 ++++---
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc81bcfd/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index e9a949a..f7b6de9 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -2320,6 +2320,10 @@ class ServerImpl extends TcpDiscoveryImpl {
for (TcpDiscoveryNode n : failedNodes)
msgWorker.addMessage(new TcpDiscoveryNodeFailedMessage(locNodeId, n.id(), n.internalOrder()));
+
+ LT.warn(log, null, "Local node has detected failed nodes and started cluster-wide procedure. " +
+ "To speed up failure detection please see 'Failure Detection' section under javadoc" +
+ "for 'TcpDiscoverySpi'");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc81bcfd/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 9a26867..d7c33a5 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -64,9 +64,9 @@ import java.util.concurrent.atomic.*;
* {@link TcpDiscoveryIpFinder} about self start (stops when send succeeds)
* and then this info goes to coordinator. When coordinator processes join request
* and issues node added messages and all other nodes then receive info about new node.
- * <h1 class="header">Configuration</h1>
- * <h2 class="header">Important Notice</h2>
- * Configuration defaults are chosen to make possible for discovery SPI to reliably work on
+ * <h1 class="header">Failure Detection</h1>
+ * Configuration defaults (see Configuration section below for details)
+ * are chosen to make possible for discovery SPI work reliably on
* most of hardware and virtual deployments, but this has made failure detection time worse.
* <p>
* For stable low-latency networks the following more aggressive settings are recommended
@@ -76,6 +76,7 @@ import java.util.concurrent.atomic.*;
* <li>Socket timeout (see {@link #setSocketTimeout(long)}) - 200ms</li>
* <li>Message acknowledgement timeout (see {@link #setAckTimeout(long)}) - 50ms</li>
* </ul>
+ * <h1 class="header">Configuration</h1>
* <h2 class="header">Mandatory</h2>
* There are no mandatory configuration parameters.
* <h2 class="header">Optional</h2>
[02/14] incubator-ignite git commit: # minor
Posted by ak...@apache.org.
# minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/08d134dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/08d134dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/08d134dd
Branch: refs/heads/ignite-sprint-7
Commit: 08d134dd43f143ee8d01f6394de27426c64a96ea
Parents: d874b00
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Jun 18 13:46:52 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Jun 18 13:46:52 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheUtils.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08d134dd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 3bd2a45..8c26046 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -391,6 +391,15 @@ public class GridCacheUtils {
}
/**
+ * Gets public cache name substituting null name by {@code 'default'}.
+ *
+ * @return Public cache name substituting null name by {@code 'default'}.
+ */
+ public static String namexx(@Nullable String name) {
+ return name == null ? "default" : name;
+ }
+
+ /**
* @return Partition to state transformer.
*/
@SuppressWarnings({"unchecked"})
[03/14] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-6' into ignite-sprint-6
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b23ea747
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b23ea747
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b23ea747
Branch: refs/heads/ignite-sprint-7
Commit: b23ea747d9cf351f607d60f520781f5d46e98715
Parents: 08d134d c1eee18
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Jun 18 13:47:19 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Jun 18 13:47:19 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 5 +++++
.../ignite/internal/processors/query/GridQueryProcessor.java | 7 +++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
[07/14] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-6' into ignite-sprint-6
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-sprint-6' into ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cb862b65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cb862b65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cb862b65
Branch: refs/heads/ignite-sprint-7
Commit: cb862b65ffc1e0ecfc9a93b6af10881586df1ede
Parents: 5011c2b ca81476
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Thu Jun 18 14:50:56 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Thu Jun 18 14:50:56 2015 +0300
----------------------------------------------------------------------
.../datastreamer/DataStreamerMultiThreadedSelfTest.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------