You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/15 19:52:59 UTC
[1/5] incubator-ignite git commit: # IGNITE-709
GridEventConsumeSelfTest must not implement Serializable.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-709_3 ce5eb8bd2 -> 1d8ae1612
# IGNITE-709 GridEventConsumeSelfTest must not implement Serializable.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5a983ffc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5a983ffc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5a983ffc
Branch: refs/heads/ignite-709_3
Commit: 5a983ffc77632c462a65b137d455873405374064
Parents: fd94eab
Author: sevdokimov <se...@gridgain.com>
Authored: Fri May 15 20:17:09 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Fri May 15 20:17:09 2015 +0300
----------------------------------------------------------------------
.../continuous/GridEventConsumeSelfTest.java | 63 ++++++++++++--------
.../testframework/junits/GridAbstractTest.java | 16 +++++
2 files changed, 53 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a983ffc/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
index 7a9bd3a..f41aaa0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
@@ -28,9 +28,11 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.marshaller.optimized.*;
import org.apache.ignite.resources.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
import org.apache.ignite.testframework.junits.common.*;
-import java.io.*;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
@@ -42,7 +44,7 @@ import static org.apache.ignite.internal.processors.continuous.GridContinuousPro
/**
* Event consume test.
*/
-public class GridEventConsumeSelfTest extends GridCommonAbstractTest implements Serializable {
+public class GridEventConsumeSelfTest extends GridCommonAbstractTest {
/** */
private static final String PRJ_PRED_CLS_NAME = "org.apache.ignite.tests.p2p.GridEventConsumeProjectionPredicate";
@@ -55,6 +57,9 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest implements
/** Number of created consumes per thread in multithreaded test. */
private static final int CONSUME_CNT = 500;
+ /** */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
/** Consume latch. */
private static volatile CountDownLatch consumeLatch;
@@ -71,6 +76,12 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest implements
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+ TcpDiscoverySpi disc = new TcpDiscoverySpi();
+
+ disc.setIpFinder(IP_FINDER);
+
+ cfg.setDiscoverySpi(disc);
+
if (include)
cfg.setUserAttributes(F.asMap("include", true));
@@ -80,7 +91,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest implements
}
/** {@inheritDoc} */
- @Override protected void beforeTestsStarted() throws Exception {
+ @Override protected void beforeTest() throws Exception {
assertTrue(GRID_CNT > 1);
include = true;
@@ -93,30 +104,30 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest implements
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
- assertEquals(GRID_CNT, grid(0).cluster().nodes().size());
+ try {
+ assertEquals(GRID_CNT, grid(0).cluster().nodes().size());
- for (int i = 0; i < GRID_CNT; i++) {
- IgniteEx grid = grid(i);
+ for (int i = 0; i < GRID_CNT; i++) {
+ IgniteEx grid = grid(i);
- GridContinuousProcessor proc = grid.context().continuous();
+ GridContinuousProcessor proc = grid.context().continuous();
- try {
- if (!noAutoUnsubscribe)
- assertEquals(0, U.<Map>field(proc, "rmtInfos").size());
- }
- finally {
- U.<Map>field(proc, "rmtInfos").clear();
- }
+ try {
+ if (!noAutoUnsubscribe)
+ assertEquals(0, U.<Map>field(proc, "rmtInfos").size());
+ }
+ finally {
+ U.<Map>field(proc, "rmtInfos").clear();
+ }
- assertEquals(0, U.<Map>field(proc, "rmtInfos").size());
- assertEquals(0, U.<Map>field(proc, "startFuts").size());
- assertEquals(0, U.<Map>field(proc, "stopFuts").size());
+ assertEquals(0, U.<Map>field(proc, "rmtInfos").size());
+ assertEquals(0, U.<Map>field(proc, "startFuts").size());
+ assertEquals(0, U.<Map>field(proc, "stopFuts").size());
+ }
+ }
+ finally {
+ stopAllGrids();
}
}
@@ -641,7 +652,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest implements
final CountDownLatch latch = new CountDownLatch(GRID_CNT + 1);
UUID consumeId = grid(0).events().remoteListen(
- new P2<UUID, Event>() {
+ notSerializableProxy(new P2<UUID, Event>() {
@Override public boolean apply(UUID nodeId, Event evt) {
info("Event from " + nodeId + " [" + evt.shortDisplay() + ']');
@@ -653,12 +664,12 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest implements
return true;
}
- },
- new P1<Event>() {
+ }),
+ notSerializableProxy(new P1<Event>() {
@Override public boolean apply(Event evt) {
return evt.type() == EVT_JOB_STARTED;
}
- },
+ }),
EVT_JOB_STARTED, EVT_JOB_FINISHED
);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a983ffc/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index f3a9051..37a5dc5 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -1389,6 +1389,22 @@ public abstract class GridAbstractTest extends TestCase {
/**
* @param obj Object that should be wrap proxy
+ * @return Created proxy.
+ */
+ protected <T> T notSerializableProxy(final T obj) {
+ Class<T> cls = (Class<T>)obj.getClass();
+
+ Class<T>[] interfaces = (Class<T>[])cls.getInterfaces();
+
+ assert interfaces.length > 0;
+
+ Class<T> lastItf = interfaces[interfaces.length - 1];
+
+ return notSerializableProxy(obj, lastItf, Arrays.copyOf(interfaces, interfaces.length - 1));
+ }
+
+ /**
+ * @param obj Object that should be wrap proxy
* @param itfCls Interface that should be implemented by proxy
* @param itfClses Interfaces that should be implemented by proxy (vararg parameter)
* @return Created proxy.
[5/5] incubator-ignite git commit: # ignite-709_3
Posted by sb...@apache.org.
# ignite-709_3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1d8ae161
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1d8ae161
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1d8ae161
Branch: refs/heads/ignite-709_3
Commit: 1d8ae1612471731136e7b5c19d6cdfbd6b9b61bc
Parents: 46b36e8
Author: sboikov <se...@inria.fr>
Authored: Fri May 15 20:52:51 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Fri May 15 20:52:51 2015 +0300
----------------------------------------------------------------------
.../ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d8ae161/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
index 2a5616f..7fb4563 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheDataStructuresSelfTestSuite.java
@@ -113,7 +113,7 @@ public class IgniteCacheDataStructuresSelfTestSuite extends TestSuite {
suite.addTest(new TestSuite(IgniteDataStructureUniqueNameTest.class));
suite.addTest(new TestSuite(IgniteClientDataStructuresTest.class));
- // suite.addTest(new TestSuite(IgniteClientDiscoveryDataStructuresTest.class));
+ suite.addTest(new TestSuite(IgniteClientDiscoveryDataStructuresTest.class));
return suite;
}
[2/5] incubator-ignite git commit: # IGNITE-709 Collect discovery
data from client on client join topology.
Posted by sb...@apache.org.
# IGNITE-709 Collect discovery data from client on client join topology.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/defc8b0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/defc8b0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/defc8b0d
Branch: refs/heads/ignite-709_3
Commit: defc8b0d62d17b009a7087931a049f314bf4b914
Parents: 5a983ff
Author: sevdokimov <se...@gridgain.com>
Authored: Fri May 15 20:24:55 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Fri May 15 20:24:55 2015 +0300
----------------------------------------------------------------------
.../discovery/tcp/TcpClientDiscoverySpi.java | 2 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 28 --------------------
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 27 +++++++++++++++++++
3 files changed, 28 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/defc8b0d/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index e9ddbfd..bd7528a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@ -532,7 +532,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
TcpDiscoveryAbstractMessage msg = recon ?
new TcpDiscoveryClientReconnectMessage(getLocalNodeId(), rmtNodeId,
lastMsgId) :
- new TcpDiscoveryJoinRequestMessage(locNode, null);
+ new TcpDiscoveryJoinRequestMessage(locNode, collectExchangeData(getLocalNodeId()));
msg.client(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/defc8b0d/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 170670f..bd9d572 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
@@ -2235,34 +2235,6 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
}
/**
- * @param nodeId Node ID.
- * @return Marshalled exchange data.
- */
- private Map<Integer, byte[]> collectExchangeData(UUID nodeId) {
- Map<Integer, Serializable> data = exchange.collect(nodeId);
-
- Map<Integer, byte[]> data0 = null;
-
- if (data != null) {
- data0 = U.newHashMap(data.size());
-
- for (Map.Entry<Integer, Serializable> entry : data.entrySet()) {
- try {
- byte[] bytes = marsh.marshal(entry.getValue());
-
- data0.put(entry.getKey(), bytes);
- }
- catch (IgniteCheckedException e) {
- U.error(log, "Failed to marshal discovery data " +
- "[comp=" + entry.getKey() + ", data=" + entry.getValue() + ']', e);
- }
- }
- }
-
- return data0;
- }
-
- /**
* @param msg Message.
* @param nodeId Node ID.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/defc8b0d/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
index 181065d..1b22aaa 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
@@ -782,6 +782,33 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov
}
/**
+ * @param nodeId Node ID.
+ * @return Marshalled exchange data.
+ */
+ protected Map<Integer, byte[]> collectExchangeData(UUID nodeId) {
+ Map<Integer, Serializable> data = exchange.collect(nodeId);
+
+ if (data == null)
+ return null;
+
+ Map<Integer, byte[]> data0 = U.newHashMap(data.size());
+
+ for (Map.Entry<Integer, Serializable> entry : data.entrySet()) {
+ try {
+ byte[] bytes = marsh.marshal(entry.getValue());
+
+ data0.put(entry.getKey(), bytes);
+ }
+ catch (IgniteCheckedException e) {
+ U.error(log, "Failed to marshal discovery data " +
+ "[comp=" + entry.getKey() + ", data=" + entry.getValue() + ']', e);
+ }
+ }
+
+ return data0;
+ }
+
+ /**
* @param joiningNodeID Joining node ID.
* @param nodeId Remote node ID for which data is provided.
* @param data Collection of marshalled discovery data objects from different components.
[4/5] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-709_2' into ignite-709_3
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-709_3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/46b36e8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/46b36e8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/46b36e8f
Branch: refs/heads/ignite-709_3
Commit: 46b36e8fd728edb71aee578bbace93b746888bf5
Parents: ce5eb8b aaa7425
Author: sboikov <se...@inria.fr>
Authored: Fri May 15 20:50:29 2015 +0300
Committer: sboikov <se...@inria.fr>
Committed: Fri May 15 20:50:29 2015 +0300
----------------------------------------------------------------------
.../discovery/tcp/TcpClientDiscoverySpi.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 28 ---------
.../discovery/tcp/TcpDiscoverySpiAdapter.java | 27 +++++++++
.../continuous/GridEventConsumeSelfTest.java | 63 ++++++++++++--------
.../testframework/junits/GridAbstractTest.java | 16 +++++
5 files changed, 82 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
[3/5] incubator-ignite git commit: # IGNITE-709 Bug fix: waiting for
dead worker.
Posted by sb...@apache.org.
# IGNITE-709 Bug fix: waiting for dead worker.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aaa74250
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aaa74250
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aaa74250
Branch: refs/heads/ignite-709_3
Commit: aaa742508f7d256d11df22005b1948eaff721cf4
Parents: defc8b0
Author: sevdokimov <se...@gridgain.com>
Authored: Fri May 15 20:27:52 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Fri May 15 20:27:52 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aaa74250/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index bd7528a..7925de6 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@ -675,7 +675,7 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
public void waitForMessagePrecessed() {
Object last = msgWorker.queue.peekLast();
- while (last != null && msgWorker.queue.contains(last)) {
+ while (last != null && msgWorker.isAlive() && msgWorker.queue.contains(last)) {
try {
Thread.sleep(10);
}