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/12/18 12:14:31 UTC
[1/9] ignite git commit: ignite-2204 Disabled hanging test.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 a8beeae10 -> 098963bc0
ignite-2204 Disabled hanging test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5a56da6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5a56da6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5a56da6
Branch: refs/heads/ignite-1537
Commit: d5a56da6b2503ef06cd3620a24f487988c2be5e2
Parents: a4b547b
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 18 09:40:35 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 18 09:40:35 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/CacheGetInsideLockChangingTopologyTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d5a56da6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
index 7073a94..03502d3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
@@ -357,6 +357,8 @@ public class CacheGetInsideLockChangingTopologyTest extends GridCommonAbstractTe
* @throws Exception If failed.
*/
public void testMultithreaded() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-2204");
+
final AtomicBoolean finished = new AtomicBoolean();
final int NEW_NODE = SRVS + CLIENTS;
[9/9] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.5' into ignite-1537
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Conflicts:
modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/098963bc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/098963bc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/098963bc
Branch: refs/heads/ignite-1537
Commit: 098963bc07185dbb27988e5da050c89e8b63fbe4
Parents: 527aa2a
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 18 14:14:15 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 18 14:14:15 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgniteClientReconnectCacheTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/098963bc/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index 5456700..ad6c46f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -76,7 +76,6 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.values;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
[5/9] ignite git commit: Failed test
IgniteSqlSplitterSelfTest.testFunctionNpe: Added reference to a ticket.
Posted by sb...@apache.org.
Failed test IgniteSqlSplitterSelfTest.testFunctionNpe: Added reference to a ticket.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7ff47599
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7ff47599
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7ff47599
Branch: refs/heads/ignite-1537
Commit: 7ff475999116174852222e3562b8de73e943bd78
Parents: 301e7a1
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Dec 18 12:43:55 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Dec 18 12:43:55 2015 +0300
----------------------------------------------------------------------
.../internal/processors/query/IgniteSqlSplitterSelfTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7ff47599/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
index 865a0fd..5702649 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
@@ -230,7 +230,8 @@ public class IgniteSqlSplitterSelfTest extends GridCommonAbstractTest {
*
*/
public void testFunctionNpe() {
- // TODO IGNITE-1886
+ assert false : "https://issues.apache.org/jira/browse/IGNITE-1886";
+
IgniteCache<Integer, User> userCache = ignite(0).createCache(
cacheConfig("UserCache", true, Integer.class, User.class));
IgniteCache<Integer, UserOrder> userOrderCache = ignite(0).createCache(
[3/9] ignite git commit: ignite-1.5 Properly handle duplicated job
responses in GridTaskWorker.onResponse. Use correct 'initialRebalanceFuture'
for client nodes.
Posted by sb...@apache.org.
ignite-1.5 Properly handle duplicated job responses in GridTaskWorker.onResponse. Use correct 'initialRebalanceFuture' for client nodes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b1f90655
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b1f90655
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b1f90655
Branch: refs/heads/ignite-1537
Commit: b1f906555cea8990dd39e8050ca4348f09da7f7f
Parents: 301e7a1
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 18 12:08:20 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 18 12:08:20 2015 +0300
----------------------------------------------------------------------
.../ClientAbstractConnectivitySelfTest.java | 2 +-
.../internal/cluster/ClusterGroupAdapter.java | 10 +-
.../dht/preloader/GridDhtPreloader.java | 2 +-
.../processors/task/GridTaskWorker.java | 8 +-
.../internal/util/lang/GridNodePredicate.java | 13 +-
.../ignite/internal/util/nio/GridNioServer.java | 11 +-
.../util/nio/GridSelectorNioSessionImpl.java | 7 +
.../TcpDiscoveryMulticastIpFinder.java | 12 +-
.../ignite/internal/ClusterGroupSelfTest.java | 32 ++-
.../IgniteClientReconnectCacheTest.java | 7 +-
.../ignite/internal/TaskNodeRestartTest.java | 230 +++++++++++++++++++
.../IgniteCacheSizeFailoverTest.java | 4 +-
.../random/RandomEvictionPolicySelfTest.java | 4 +-
.../GridServiceProcessorStopSelfTest.java | 18 +-
.../IgniteMessagingWithClientTest.java | 2 -
.../GridSessionCheckpointAbstractSelfTest.java | 3 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +-
.../testsuites/IgniteComputeGridTestSuite.java | 2 +
18 files changed, 340 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
index ef18a29..8207ccf 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractConnectivitySelfTest.java
@@ -134,7 +134,7 @@ public abstract class ClientAbstractConnectivitySelfTest extends GridCommonAbstr
/**
* Simple test of address list filtering.
- * @throws Exception
+ * @throws Exception If failed.
*/
public void testResolveReachableOneAddress() throws Exception {
InetAddress addr = InetAddress.getByAddress(new byte[] {127, 0, 0, 1} );
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
index 9039ed8..75168a1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java
@@ -626,7 +626,15 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable {
/** {@inheritDoc} */
@Override public final ClusterGroup forRandom() {
- return ids != null ? forNodeId(F.rand(ids)) : forNode(F.rand(nodes()));
+ if (!F.isEmpty(ids))
+ return forNodeId(F.rand(ids));
+
+ Collection<ClusterNode> nodes = nodes();
+
+ if (nodes.isEmpty())
+ return new ClusterGroupAdapter(ctx, null, Collections.<UUID>emptySet());
+
+ return forNode(F.rand(nodes));
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index 9a6246f..c46a66c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -482,7 +482,7 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
/** {@inheritDoc} */
@Override public IgniteInternalFuture<?> initialRebalanceFuture() {
- return cctx.kernalContext().clientNode() ? new GridFinishedFuture<>(true) : initRebalanceFut;
+ return cctx.kernalContext().clientNode() ? startFut : initRebalanceFut;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
index 9315d7c..59d3f90 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
@@ -696,8 +696,9 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject {
if (log.isDebugEnabled())
U.warn(log, "Received response for unknown child job (was job presumed failed?): " + res);
- selfOccupied = true;
+ res = delayedRess.poll();
+ // We can not return here because there can be more delayed messages in the queue.
continue;
}
@@ -708,7 +709,10 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject {
if (log.isDebugEnabled())
log.debug("Received redundant response for a job (will ignore): " + res);
- return;
+ res = delayedRess.poll();
+
+ // We can not return here because there can be more delayed messages in the queue.
+ continue;
}
if (!jobRes.getNode().id().equals(res.getNodeId())) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
index 4ce0b35..edec862 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridNodePredicate.java
@@ -100,13 +100,18 @@ public class GridNodePredicate implements IgnitePredicate<ClusterNode>, Iterable
public GridNodePredicate(@Nullable ClusterNode... nodes) {
if (F.isEmpty(nodes))
ids = Collections.emptySet();
- else if (nodes.length == 1)
- ids = Collections.singleton(nodes[0].id());
+ else if (nodes.length == 1) {
+ ClusterNode node = nodes[0];
+
+ ids = node != null ? Collections.singleton(node.id()) : Collections.<UUID>emptySet();
+ }
else {
ids = U.newHashSet(nodes.length);
- for (ClusterNode n : nodes)
- ids.add(n.id());
+ for (ClusterNode n : nodes) {
+ if (n != null)
+ ids.add(n.id());
+ }
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index 53cec84..be28c30 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -425,10 +425,10 @@ public class GridNioServer<T> {
int msgCnt = sys ? ses.offerSystemFuture(fut) : ses.offerFuture(fut);
- IgniteInClosure<IgniteException> ackClosure;
+ IgniteInClosure<IgniteException> ackC;
- if (!sys && (ackClosure = ses.removeMeta(ACK_CLOSURE.ordinal())) != null)
- fut.ackClosure(ackClosure);
+ if (!sys && (ackC = ses.removeMeta(ACK_CLOSURE.ordinal())) != null)
+ fut.ackClosure(ackC);
if (ses.closed()) {
if (ses.removeFuture(fut))
@@ -1609,15 +1609,14 @@ public class GridNioServer<T> {
sessions.remove(ses);
- if (closed)
- ses.onServerStopped();
-
SelectionKey key = ses.key();
// Shutdown input and output so that remote client will see correct socket close.
Socket sock = ((SocketChannel)key.channel()).socket();
if (ses.setClosed()) {
+ ses.onClosed();
+
if (directBuf) {
if (ses.writeBuffer() != null)
((DirectBuffer)ses.writeBuffer()).cleaner().clean();
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
index 6b1f6a7..deb7d2b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java
@@ -294,6 +294,13 @@ class GridSelectorNioSessionImpl extends GridNioSessionImpl {
*
*/
void onServerStopped() {
+ onClosed();
+ }
+
+ /**
+ *
+ */
+ void onClosed() {
if (sem != null)
sem.release(1_000_000);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
index 77bb99d..8402cbf 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java
@@ -136,6 +136,9 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
/** */
private boolean mcastErr;
+ @GridToStringExclude
+ private Set<InetSocketAddress> locNodeAddrs;
+
/**
* Constructs new IP finder.
*/
@@ -369,6 +372,8 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
}
if (!clientMode) {
+ locNodeAddrs = new HashSet<>(addrs);
+
if (addrSnds.isEmpty()) {
try {
// Create non-bound socket if local host is loopback or failed to create sockets explicitly
@@ -403,8 +408,11 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
else
mcastErr = true;
}
- else
+ else {
assert addrSnds.isEmpty() : addrSnds;
+
+ locNodeAddrs = Collections.emptySet();
+ }
}
/** {@inheritDoc} */
@@ -607,7 +615,7 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder {
U.close(sock);
}
- if (!rmtAddrs.isEmpty())
+ if (rmtAddrs.size() > locNodeAddrs.size())
break;
if (i < addrReqAttempts - 1) // Wait some time before re-sending address request.
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
index d916d78..18eb3b7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
@@ -109,6 +109,10 @@ public class ClusterGroupSelfTest extends ClusterGroupAbstractTest {
}
assertEquals(oldest.node(), ignite.cluster().forNode(node).node());
+
+ ClusterGroup emptyGrp = ignite.cluster().forAttribute("nonExistent", "val");
+
+ assertEquals(0, emptyGrp.forOldest().nodes().size());
}
/**
@@ -130,6 +134,10 @@ public class ClusterGroupSelfTest extends ClusterGroupAbstractTest {
}
assertEquals(youngest.node(), ignite.cluster().forNode(node).node());
+
+ ClusterGroup emptyGrp = ignite.cluster().forAttribute("nonExistent", "val");
+
+ assertEquals(0, emptyGrp.forYoungest().nodes().size());
}
/**
@@ -187,8 +195,7 @@ public class ClusterGroupSelfTest extends ClusterGroupAbstractTest {
assertEquals(grid(gridMaxOrder(clusterSize, false)).localNode().id(), oddYoungest.node().id());
assertEquals(grid(2).localNode().id(), oddOldest.node().id());
- try (Ignite g4 = startGrid(NODES_CNT);
- Ignite g5 = startGrid(NODES_CNT + 1))
+ try (Ignite g4 = startGrid(NODES_CNT); Ignite g5 = startGrid(NODES_CNT + 1))
{
clusterSize = g4.cluster().nodes().size();
@@ -241,6 +248,27 @@ public class ClusterGroupSelfTest extends ClusterGroupAbstractTest {
}
/**
+ * @throws Exception If failed.
+ */
+ public void testEmptyGroup() throws Exception {
+ ClusterGroup emptyGrp = ignite.cluster().forAttribute("nonExistent", "val");
+
+ assertEquals(0, emptyGrp.forOldest().nodes().size());
+ assertEquals(0, emptyGrp.forYoungest().nodes().size());
+ assertEquals(0, emptyGrp.forAttribute("nonExistent2", "val").nodes().size());
+ assertEquals(0, emptyGrp.forCacheNodes("cacheName").nodes().size());
+ assertEquals(0, emptyGrp.forClientNodes("cacheName").nodes().size());
+ assertEquals(0, emptyGrp.forClients().nodes().size());
+ assertEquals(0, emptyGrp.forDaemons().nodes().size());
+ assertEquals(0, emptyGrp.forDataNodes("cacheName").nodes().size());
+ assertEquals(0, emptyGrp.forRandom().nodes().size());
+ assertEquals(0, emptyGrp.forRemotes().nodes().size());
+ assertEquals(0, emptyGrp.forServers().nodes().size());
+ assertEquals(0, emptyGrp.forHost(ignite.cluster().localNode()).nodes().size());
+ assertEquals(0, emptyGrp.forHost("127.0.0.1").nodes().size());
+ }
+
+ /**
* @param cnt Count.
* @param even Even.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index 5dbf75a..5234d6e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -73,6 +73,9 @@ import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.values;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -169,6 +172,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
ccfg.setWriteSynchronizationMode(FULL_SYNC);
ccfg.setName("nearCache");
+ ccfg.setAtomicWriteOrderMode(PRIMARY);
final IgniteCache<Object, Object> nearCache = client.getOrCreateCache(ccfg, new NearCacheConfiguration<>());
@@ -786,8 +790,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
for (CacheAtomicityMode atomicityMode : CacheAtomicityMode.values()) {
CacheAtomicWriteOrderMode[] writeOrders =
- atomicityMode == ATOMIC ? CacheAtomicWriteOrderMode.values() :
- new CacheAtomicWriteOrderMode[]{CacheAtomicWriteOrderMode.CLOCK};
+ atomicityMode == ATOMIC ? values() : new CacheAtomicWriteOrderMode[]{CLOCK};
for (CacheAtomicWriteOrderMode writeOrder : writeOrders) {
for (CacheWriteSynchronizationMode syncMode : CacheWriteSynchronizationMode.values()) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
new file mode 100644
index 0000000..1e3b213
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
@@ -0,0 +1,230 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCompute;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.compute.ComputeJob;
+import org.apache.ignite.compute.ComputeJobAdapter;
+import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.compute.ComputeJobResultPolicy;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskAdapter;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteCallable;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ *
+ */
+public class TaskNodeRestartTest extends GridCommonAbstractTest {
+ /** */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /** */
+ private static final int NODES = 3;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
+
+ ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ super.beforeTestsStarted();
+
+ startGridsMultiThreaded(NODES);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ stopAllGrids();
+
+ super.afterTestsStopped();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testTaskNodeRestart() throws Exception {
+ final AtomicBoolean finished = new AtomicBoolean();
+
+ final AtomicInteger stopIdx = new AtomicInteger();
+
+ IgniteInternalFuture<?> restartFut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ int idx = stopIdx.getAndIncrement();
+
+ int node = NODES + idx;
+
+ while (!finished.get()) {
+ log.info("Start node: " + node);
+
+ startGrid(node);
+
+ U.sleep(300);
+
+ log.info("Stop node: " + node);
+
+ stopGrid(node);
+ }
+
+ return null;
+ }
+ }, 2, "stop-thread");
+
+ IgniteInternalFuture<?> fut = null;
+
+ try {
+ final long stopTime = System.currentTimeMillis() + 60_000;
+
+ final AtomicInteger idx = new AtomicInteger();
+
+ fut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ int node = idx.getAndIncrement() % NODES;
+
+ Ignite ignite = ignite(node);
+
+ log.info("Start thread: " + ignite.name());
+
+ IgniteCompute compute = ignite.compute();
+
+ while (U.currentTimeMillis() < stopTime) {
+ try {
+ compute.broadcast(new TestCallable());
+
+ compute.call(new TestCallable());
+
+ compute.execute(new TestTask1(), null);
+
+ compute.execute(new TestTask2(), null);
+ }
+ catch (IgniteException e) {
+ log.info("Error: " + e);
+ }
+ }
+
+ return null;
+ }
+ }, 20, "test-thread");
+
+ fut.get(90_000);
+
+ finished.set(true);
+
+ restartFut.get();
+ }
+ finally {
+ finished.set(true);
+
+ if (fut != null)
+ fut.cancel();
+
+ restartFut.get(5000);
+ }
+ }
+
+ /**
+ *
+ */
+ private static class TestTask1 extends ComputeTaskAdapter<Void, Void> {
+ /** {@inheritDoc} */
+ @Override public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Void arg)
+ throws IgniteException {
+ Map<TestJob, ClusterNode> jobs = new HashMap<>();
+
+ for (ClusterNode node : subgrid)
+ jobs.put(new TestJob(), node);
+
+ return jobs;
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws IgniteException {
+ return null;
+ }
+ }
+
+ /**
+ *
+ */
+ private static class TestTask2 implements ComputeTask<Void, Void> {
+ /** {@inheritDoc} */
+ @Nullable public Map<? extends ComputeJob, ClusterNode> map(List<ClusterNode> subgrid, Void arg)
+ throws IgniteException {
+ Map<TestJob, ClusterNode> jobs = new HashMap<>();
+
+ for (ClusterNode node : subgrid)
+ jobs.put(new TestJob(), node);
+
+ return jobs;
+ }
+
+ /** {@inheritDoc} */
+ @Override public ComputeJobResultPolicy result(ComputeJobResult res, List<ComputeJobResult> rcvd) {
+ return ComputeJobResultPolicy.WAIT;
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public Void reduce(List<ComputeJobResult> results) {
+ return null;
+ }
+ }
+
+ /**
+ *
+ */
+ private static class TestJob extends ComputeJobAdapter {
+ /** {@inheritDoc} */
+ @Override public Object execute() throws IgniteException {
+ return null;
+ }
+ }
+
+ /**
+ *
+ */
+ private static class TestCallable implements IgniteCallable<Void> {
+ /** {@inheritDoc} */
+ @Nullable @Override public Void call() throws Exception {
+ return null;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
index 1738a0d..5d074e1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSizeFailoverTest.java
@@ -82,7 +82,7 @@ public class IgniteCacheSizeFailoverTest extends GridCommonAbstractTest {
IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new Callable<Object>() {
@Override public Object call() throws Exception {
- int idx = cntr.getAndIncrement();
+ int idx = cntr.getAndIncrement() % 2;
IgniteCache<Object, Object> cache = ignite(idx).cache(null);
@@ -97,7 +97,7 @@ public class IgniteCacheSizeFailoverTest extends GridCommonAbstractTest {
return null;
}
- }, 2, "size-thread");
+ }, 10, "size-thread");
try {
for (int i = 0; i < 10; i++) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
index af04cdc..a253a25 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/random/RandomEvictionPolicySelfTest.java
@@ -197,7 +197,9 @@ public class RandomEvictionPolicySelfTest extends
}
}, 10);
- assert g.cache(null).size() <= max;
+ int size = g.cache(null).size();
+
+ assertTrue("Unexpected cache size [size=" + size + ", max=" + max + ']', size <= max);
info(policy(0));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
index 16ea5e4..dfea37a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorStopSelfTest.java
@@ -23,6 +23,7 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteServices;
import org.apache.ignite.Ignition;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.services.Service;
import org.apache.ignite.services.ServiceContext;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -31,6 +32,13 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
* Tests that {@link GridServiceProcessor} completes deploy/undeploy futures during node stop.
*/
public class GridServiceProcessorStopSelfTest extends GridCommonAbstractTest {
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+
+ super.afterTest();
+ }
+
/**
* @throws Exception If failed.
*/
@@ -43,6 +51,8 @@ public class GridServiceProcessorStopSelfTest extends GridCommonAbstractTest {
Thread t = new Thread(new Runnable() {
@Override public void run() {
+ Thread.currentThread().setName("deploy-thread");
+
IgniteServices svcs = ignite.services();
IgniteServices services = svcs.withAsync();
@@ -69,13 +79,19 @@ public class GridServiceProcessorStopSelfTest extends GridCommonAbstractTest {
Ignition.stopAll(true);
- assertTrue("Deploy future isn't completed", finishLatch.await(15, TimeUnit.SECONDS));
+ boolean wait = finishLatch.await(15, TimeUnit.SECONDS);
+
+ if (!wait)
+ U.dumpThreads(log);
+
+ assertTrue("Deploy future isn't completed", wait);
}
/**
* Simple map service.
*/
public interface TestService {
+ // No-op.
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java
index 62f4c1a..e885f48 100644
--- a/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/messaging/IgniteMessagingWithClientTest.java
@@ -78,8 +78,6 @@ public class IgniteMessagingWithClientTest extends GridCommonAbstractTest implem
* @throws Exception If failed.
*/
public void testMessageSendWithClientJoin() throws Exception {
- fail("https://issues.apache.org/jira/browse/IGNITE-996");
-
startGrid(0);
Ignite ignite1 = startGrid(1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
index 06cbf1c..c087d38 100644
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCheckpointAbstractSelfTest.java
@@ -36,6 +36,7 @@ import org.apache.ignite.compute.ComputeTaskSessionScope;
import org.apache.ignite.compute.ComputeTaskSplitAdapter;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.resources.TaskSessionResource;
@@ -55,7 +56,7 @@ public abstract class GridSessionCheckpointAbstractSelfTest extends GridCommonAb
private static final int SPLIT_COUNT = 5;
/** */
- private static CountDownLatch taskLatch;
+ private static volatile CountDownLatch taskLatch;
/** */
protected GridSessionCheckpointAbstractSelfTest() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
index 5475f25..5af0596 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
@@ -980,7 +980,7 @@ public class TcpDiscoverySelfTest extends GridCommonAbstractTest {
}
}
- assertTrue("GridTcpDiscoveryMulticastIpFinder should register port." , found);
+ assertTrue("TcpDiscoveryMulticastIpFinder should register port." , found);
}
}
finally {
http://git-wip-us.apache.org/repos/asf/ignite/blob/b1f90655/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
index 23f2edc..e2c7e26 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
@@ -65,6 +65,7 @@ import org.apache.ignite.internal.IgniteComputeEmptyClusterGroupTest;
import org.apache.ignite.internal.IgniteComputeTopologyExceptionTest;
import org.apache.ignite.internal.IgniteExecutorServiceTest;
import org.apache.ignite.internal.IgniteExplicitImplicitDeploymentSelfTest;
+import org.apache.ignite.internal.TaskNodeRestartTest;
import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManagerSelfTest;
import org.apache.ignite.internal.managers.checkpoint.GridCheckpointTaskSelfTest;
import org.apache.ignite.internal.managers.communication.GridCommunicationManagerListenersSelfTest;
@@ -144,6 +145,7 @@ public class IgniteComputeGridTestSuite {
suite.addTestSuite(IgniteComputeEmptyClusterGroupTest.class);
suite.addTestSuite(IgniteComputeTopologyExceptionTest.class);
suite.addTestSuite(GridTaskFailoverAffinityRunTest.class);
+ suite.addTestSuite(TaskNodeRestartTest.class);
return suite;
}
[7/9] ignite git commit: ignite-1.5 Fixed client discovery impl to
skip discovery message processing while disconnected.
Posted by sb...@apache.org.
ignite-1.5 Fixed client discovery impl to skip discovery message processing while disconnected.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9ed39096
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9ed39096
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9ed39096
Branch: refs/heads/ignite-1537
Commit: 9ed39096100cdd9a937e33ffcbe8b46784616ff9
Parents: a8beeae
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 18 14:11:02 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 18 14:11:02 2015 +0300
----------------------------------------------------------------------
.../discovery/GridDiscoveryManager.java | 4 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 48 +++++++++++---------
.../IgniteClientReconnectCacheTest.java | 26 +++++++++--
3 files changed, 52 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9ed39096/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 92d66d7..72a2bef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -1641,7 +1641,9 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
if (cache == null) {
throw new IgniteException("Failed to resolve nodes topology [cacheName=" + cacheName +
- ", topVer=" + topVer + ", history=" + discoCacheHist.keySet() +
+ ", topVer=" + topVer +
+ ", history=" + discoCacheHist.keySet() +
+ ", snap=" + snap +
", locNode=" + ctx.discovery().localNode() + ']');
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9ed39096/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
index 8f6c8a9..850cc24 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java
@@ -1828,36 +1828,42 @@ class ClientImpl extends TcpDiscoveryImpl {
return;
}
- if (!getLocalNodeId().equals(msg.creatorNodeId())) {
- TcpDiscoveryNode node = rmtNodes.remove(msg.failedNodeId());
+ if (nodeAdded()) {
+ if (!getLocalNodeId().equals(msg.creatorNodeId())) {
+ TcpDiscoveryNode node = rmtNodes.remove(msg.failedNodeId());
- if (node == null) {
- if (log.isDebugEnabled())
- log.debug("Discarding node failed message since node is not found [msg=" + msg + ']');
+ if (node == null) {
+ if (log.isDebugEnabled())
+ log.debug("Discarding node failed message since node is not found [msg=" + msg + ']');
- return;
- }
+ return;
+ }
- Collection<ClusterNode> top = updateTopologyHistory(msg.topologyVersion(), msg);
+ Collection<ClusterNode> top = updateTopologyHistory(msg.topologyVersion(), msg);
- if (state != CONNECTED) {
- if (log.isDebugEnabled())
- log.debug("Discarding node failed message (join process is not finished): " + msg);
+ if (state != CONNECTED) {
+ if (log.isDebugEnabled())
+ log.debug("Discarding node failed message (join process is not finished): " + msg);
- return;
- }
+ return;
+ }
- if (msg.warning() != null) {
- ClusterNode creatorNode = rmtNodes.get(msg.creatorNodeId());
+ if (msg.warning() != null) {
+ ClusterNode creatorNode = rmtNodes.get(msg.creatorNodeId());
- U.warn(log, "Received EVT_NODE_FAILED event with warning [" +
- "nodeInitiatedEvt=" + (creatorNode != null ? creatorNode : msg.creatorNodeId()) +
- ", msg=" + msg.warning() + ']');
- }
+ U.warn(log, "Received EVT_NODE_FAILED event with warning [" +
+ "nodeInitiatedEvt=" + (creatorNode != null ? creatorNode : msg.creatorNodeId()) +
+ ", msg=" + msg.warning() + ']');
+ }
- notifyDiscovery(EVT_NODE_FAILED, msg.topologyVersion(), node, top);
+ notifyDiscovery(EVT_NODE_FAILED, msg.topologyVersion(), node, top);
- spi.stats.onNodeFailed();
+ spi.stats.onNodeFailed();
+ }
+ }
+ else {
+ if (log.isDebugEnabled())
+ log.debug("Ignore topology message, local node not added to topology: " + msg);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9ed39096/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index 170d8ae..ed38d2b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -1087,7 +1087,7 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
clientMode = true;
- final int CLIENTS = 2;
+ final int CLIENTS = 5;
List<Ignite> clients = new ArrayList<>();
@@ -1102,12 +1102,14 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
int nodes = SRV_CNT + CLIENTS;
int srvNodes = SRV_CNT;
- for (int iter = 0; iter < 3; iter++) {
+ for (int iter = 0; iter < 5; iter++) {
log.info("Iteration: " + iter);
reconnectClientNodes(log, clients, grid(0), null);
- for (Ignite client : clients) {
+ final int expNodes = CLIENTS + srvNodes;
+
+ for (final Ignite client : clients) {
IgniteCache<Object, Object> cache = client.cache(null);
assertNotNull(cache);
@@ -1116,6 +1118,14 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
assertEquals(1, cache.get(client.name()));
+ GridTestUtils.waitForCondition(new GridAbsPredicate() {
+ @Override public boolean apply() {
+ ClusterGroup grp = client.cluster().forCacheNodes(null);
+
+ return grp.nodes().size() == expNodes;
+ }
+ }, 5000);
+
ClusterGroup grp = client.cluster().forCacheNodes(null);
assertEquals(CLIENTS + srvNodes, grp.nodes().size());
@@ -1126,7 +1136,15 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
}
for (int i = 0; i < nodes; i++) {
- Ignite ignite = grid(i);
+ final Ignite ignite = grid(i);
+
+ GridTestUtils.waitForCondition(new GridAbsPredicate() {
+ @Override public boolean apply() {
+ ClusterGroup grp = ignite.cluster().forCacheNodes(null);
+
+ return grp.nodes().size() == expNodes;
+ }
+ }, 5000);
ClusterGroup grp = ignite.cluster().forCacheNodes(null);
[8/9] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.5' into ignite-1537
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Conflicts:
modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/527aa2ad
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/527aa2ad
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/527aa2ad
Branch: refs/heads/ignite-1537
Commit: 527aa2adf51b7d4aa60013e8ae6b2b48c550863b
Parents: 9ed3909 24eccb8
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 18 14:13:41 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 18 14:13:41 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/binary/BinaryClassDescriptor.java | 5 ++++-
.../org/apache/ignite/internal/binary/BinaryWriteMode.java | 3 +++
.../apache/ignite/internal/IgniteClientReconnectCacheTest.java | 6 ++++--
.../cache/IgniteCacheBinaryEntryProcessorSelfTest.java | 4 ++--
.../distributed/CacheGetInsideLockChangingTopologyTest.java | 2 ++
.../internal/processors/query/IgniteSqlSplitterSelfTest.java | 3 ++-
6 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/527aa2ad/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index ed38d2b,5234d6e..5456700
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@@ -73,7 -73,9 +73,10 @@@ import org.apache.ignite.transactions.T
import org.apache.ignite.transactions.TransactionConcurrency;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
+ import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK;
+ import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
+ import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.values;
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
[4/9] ignite git commit: IGNITE-2199: Java 8 compile error fix
(ambiguous reference to assertEquals) - Fixes #351.
Posted by sb...@apache.org.
IGNITE-2199: Java 8 compile error fix (ambiguous reference to assertEquals) - Fixes #351.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1a2ebdd0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1a2ebdd0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1a2ebdd0
Branch: refs/heads/ignite-1537
Commit: 1a2ebdd0bef4a3dd68551ccda09111c1646c76c6
Parents: b1f9065
Author: shtykh_roman <rs...@yahoo.com>
Authored: Fri Dec 18 12:27:40 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Dec 18 12:27:40 2015 +0300
----------------------------------------------------------------------
.../cache/IgniteCacheBinaryEntryProcessorSelfTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1a2ebdd0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
index 8e20c3e..a6c2b44 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
@@ -162,11 +162,11 @@ public class IgniteCacheBinaryEntryProcessorSelfTest extends GridCommonAbstractT
assertEquals("updated-" + i, updated.stringValue());
BinaryObject updatedBinary = nodeBinaryCache.get(i);
- assertEquals(i + 1, updatedBinary.field("val"));
+ assertEquals(new Integer(i + 1), updatedBinary.field("val"));
assertEquals("updated-" + i, updatedBinary.field("strVal"));
updatedBinary = nodeBinaryCache.get(-(i + 1));
- assertEquals(i + 1, updatedBinary.field("val"));
+ assertEquals(new Integer(i + 1), updatedBinary.field("val"));
assertEquals("updated-" + i, updatedBinary.field("strVal"));
}
}
[6/9] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/24eccb87
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/24eccb87
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/24eccb87
Branch: refs/heads/ignite-1537
Commit: 24eccb87f7657703390caefe00b06b5a6db08506
Parents: 7ff4759 1a2ebdd
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Dec 18 12:44:15 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Dec 18 12:44:15 2015 +0300
----------------------------------------------------------------------
.../ClientAbstractConnectivitySelfTest.java | 2 +-
.../internal/cluster/ClusterGroupAdapter.java | 10 +-
.../dht/preloader/GridDhtPreloader.java | 2 +-
.../processors/task/GridTaskWorker.java | 8 +-
.../internal/util/lang/GridNodePredicate.java | 13 +-
.../ignite/internal/util/nio/GridNioServer.java | 11 +-
.../util/nio/GridSelectorNioSessionImpl.java | 7 +
.../TcpDiscoveryMulticastIpFinder.java | 12 +-
.../ignite/internal/ClusterGroupSelfTest.java | 32 ++-
.../IgniteClientReconnectCacheTest.java | 7 +-
.../ignite/internal/TaskNodeRestartTest.java | 230 +++++++++++++++++++
...IgniteCacheBinaryEntryProcessorSelfTest.java | 4 +-
.../IgniteCacheSizeFailoverTest.java | 4 +-
.../random/RandomEvictionPolicySelfTest.java | 4 +-
.../GridServiceProcessorStopSelfTest.java | 18 +-
.../IgniteMessagingWithClientTest.java | 2 -
.../GridSessionCheckpointAbstractSelfTest.java | 3 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +-
.../testsuites/IgniteComputeGridTestSuite.java | 2 +
19 files changed, 342 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
[2/9] ignite git commit: IGNITE-2203: Fixed a bug in
BinaryClassDescriptor causing Externalizable object to be mistakenly analyzed
for duplicate fields.
Posted by sb...@apache.org.
IGNITE-2203: Fixed a bug in BinaryClassDescriptor causing Externalizable object to be mistakenly analyzed for duplicate fields.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/301e7a1a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/301e7a1a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/301e7a1a
Branch: refs/heads/ignite-1537
Commit: 301e7a1af38a3d9ef8640e74070e8c6b558eb332
Parents: d5a56da
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Dec 18 11:46:50 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Dec 18 11:46:50 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/binary/BinaryClassDescriptor.java | 5 ++++-
.../java/org/apache/ignite/internal/binary/BinaryWriteMode.java | 3 +++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/301e7a1a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
index eac1874..1eb3882 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
@@ -166,7 +166,7 @@ public class BinaryClassDescriptor {
if (excluded)
mode = BinaryWriteMode.EXCLUSION;
else if (useOptMarshaller)
- mode = BinaryWriteMode.OBJECT; // Will not be used anywhere.
+ mode = BinaryWriteMode.OPTIMIZED; // Will not be used anywhere.
else {
if (cls == BinaryEnumObjectImpl.class)
mode = BinaryWriteMode.BINARY_ENUM;
@@ -225,6 +225,7 @@ public class BinaryClassDescriptor {
case BINARY_ENUM:
case ENUM_ARR:
case CLASS:
+ case OPTIMIZED:
case EXCLUSION:
ctor = null;
fields = null;
@@ -395,6 +396,7 @@ public class BinaryClassDescriptor {
void write(Object obj, BinaryWriterExImpl writer) throws BinaryObjectException {
assert obj != null;
assert writer != null;
+ assert mode != BinaryWriteMode.OPTIMIZED : "OptimizedMarshaller should not be used here: " + cls.getName();
writer.typeId(typeId);
@@ -648,6 +650,7 @@ public class BinaryClassDescriptor {
*/
Object read(BinaryReaderExImpl reader) throws BinaryObjectException {
assert reader != null;
+ assert mode != BinaryWriteMode.OPTIMIZED : "OptimizedMarshaller should not be used here: " + cls.getName();
Object res;
http://git-wip-us.apache.org/repos/asf/ignite/blob/301e7a1a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
index 30e0458..b037945 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java
@@ -154,6 +154,9 @@ public enum BinaryWriteMode {
OBJECT(GridBinaryMarshaller.OBJ),
/** */
+ OPTIMIZED(GridBinaryMarshaller.OBJ),
+
+ /** */
EXCLUSION(GridBinaryMarshaller.OBJ);
/** Type ID. */