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/09/14 11:24:44 UTC
[1/5] ignite git commit: Minor.
Repository: ignite
Updated Branches:
refs/heads/ignite-971 2ca3d7205 -> 455518770
Minor.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e5319199
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e5319199
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e5319199
Branch: refs/heads/ignite-971
Commit: e53191994b48e39d1943bc2bc403dcf1a1ee1afc
Parents: d076622
Author: sboikov <sb...@gridgain.com>
Authored: Mon Sep 14 11:08:36 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Sep 14 11:08:36 2015 +0300
----------------------------------------------------------------------
.../IgniteAtomicLongChangingTopologySelfTest.java | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e5319199/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
index cee54b8..1f2e035 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteAtomicLongChangingTopologySelfTest.java
@@ -62,8 +62,7 @@ public class IgniteAtomicLongChangingTopologySelfTest extends GridCommonAbstract
/**
* {@inheritDoc}
*/
- @Override
- protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
@@ -84,8 +83,7 @@ public class IgniteAtomicLongChangingTopologySelfTest extends GridCommonAbstract
/**
* {@inheritDoc}
*/
- @Override
- protected void afterTest() throws Exception {
+ @Override protected void afterTest() throws Exception {
stopAllGrids();
queue.clear();
@@ -129,8 +127,7 @@ public class IgniteAtomicLongChangingTopologySelfTest extends GridCommonAbstract
IgniteInternalFuture<Long> fut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
/** {@inheritDoc} */
- @Override
- public Void call() throws Exception {
+ @Override public Void call() throws Exception {
IgniteAtomicLong cntr = ignite(0).atomicLong(ATOMIC_LONG_NAME, 0, true);
while (run.get())
@@ -173,8 +170,7 @@ public class IgniteAtomicLongChangingTopologySelfTest extends GridCommonAbstract
IgniteInternalFuture<Long> fut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
/** {@inheritDoc} */
- @Override
- public Void call() throws Exception {
+ @Override public Void call() throws Exception {
int base = idx.getAndIncrement();
try {
@@ -261,8 +257,7 @@ public class IgniteAtomicLongChangingTopologySelfTest extends GridCommonAbstract
private IgniteInternalFuture<?> startNodeAndCreaterThread(final int i, final CountDownLatch startLatch, final AtomicBoolean run)
throws Exception {
return multithreadedAsync(new Runnable() {
- @Override
- public void run() {
+ @Override public void run() {
try {
Ignite ignite = startGrid(i);
[2/5] ignite git commit: Added more debug info in test.
Posted by sb...@apache.org.
Added more debug info in test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/02d398c6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/02d398c6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/02d398c6
Branch: refs/heads/ignite-971
Commit: 02d398c69ce63b375357dc90377c6c03bd4f0d1b
Parents: e531919
Author: sboikov <sb...@gridgain.com>
Authored: Mon Sep 14 11:18:15 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Sep 14 11:18:15 2015 +0300
----------------------------------------------------------------------
.../stream/socket/SocketStreamerSelfTest.java | 27 +++++++++++++++-----
1 file changed, 21 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/02d398c6/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java
index 185599d..da15de3 100644
--- a/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java
@@ -36,6 +36,7 @@ import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.CacheEvent;
+import org.apache.ignite.internal.util.GridConcurrentHashSet;
import org.apache.ignite.lang.IgniteBiPredicate;
import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.marshaller.Marshaller;
@@ -88,7 +89,7 @@ public class SocketStreamerSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
- startGrids(GRID_CNT);
+ startGridsMultiThreaded(GRID_CNT);
try (ServerSocket sock = new ServerSocket(0)) {
port = sock.getLocalPort();
@@ -232,8 +233,9 @@ public class SocketStreamerSelfTest extends GridCommonAbstractTest {
* @param converter Converter.
* @param r Runnable..
*/
- private void test(@Nullable SocketMessageConverter<Tuple> converter, @Nullable byte[] delim, Runnable r) throws Exception
- {
+ private void test(@Nullable SocketMessageConverter<Tuple> converter,
+ @Nullable byte[] delim,
+ Runnable r) throws Exception {
SocketStreamer<Tuple, Integer, String> sockStmr = null;
Ignite ignite = grid(0);
@@ -243,7 +245,6 @@ public class SocketStreamerSelfTest extends GridCommonAbstractTest {
cache.clear();
try (IgniteDataStreamer<Integer, String> stmr = ignite.dataStreamer(null)) {
-
stmr.allowOverwrite(true);
stmr.autoFlushFrequency(10);
@@ -268,8 +269,12 @@ public class SocketStreamerSelfTest extends GridCommonAbstractTest {
final CountDownLatch latch = new CountDownLatch(CNT);
+ final GridConcurrentHashSet<CacheEvent> evts = new GridConcurrentHashSet<>();
+
IgniteBiPredicate<UUID, CacheEvent> locLsnr = new IgniteBiPredicate<UUID, CacheEvent>() {
@Override public boolean apply(UUID uuid, CacheEvent evt) {
+ evts.add(evt);
+
latch.countDown();
return true;
@@ -284,8 +289,18 @@ public class SocketStreamerSelfTest extends GridCommonAbstractTest {
latch.await();
- for (int i = 0; i < CNT; i++)
- assertEquals(Integer.toString(i), cache.get(i));
+ for (int i = 0; i < CNT; i++) {
+ Object val = cache.get(i);
+ String exp = Integer.toString(i);
+
+ if (!exp.equals(val))
+ log.error("Unexpected cache value [key=" + i +
+ ", exp=" + exp +
+ ", val=" + val +
+ ", evts=" + evts + ']');
+
+ assertEquals(exp, val);
+ }
assertEquals(CNT, cache.size(CachePeekMode.PRIMARY));
}
[5/5] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.4' into ignite-971
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-1.4' into ignite-971
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/45551877
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/45551877
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/45551877
Branch: refs/heads/ignite-971
Commit: 4555187705cd039bee51ae9f612f99887bc58a86
Parents: 2ca3d72 b4c515e
Author: sboikov <sb...@gridgain.com>
Authored: Mon Sep 14 12:24:25 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Sep 14 12:24:25 2015 +0300
----------------------------------------------------------------------
.../dht/GridCacheTxNodeFailureSelfTest.java | 19 +++++++++-----
...gniteAtomicLongChangingTopologySelfTest.java | 15 ++++-------
.../stream/socket/SocketStreamerSelfTest.java | 27 +++++++++++++++-----
.../IgniteCacheQueryNodeRestartSelfTest2.java | 2 ++
4 files changed, 40 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/45551877/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java
----------------------------------------------------------------------
[3/5] ignite git commit: Disabled test.
Posted by sb...@apache.org.
Disabled test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/095d4b3f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/095d4b3f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/095d4b3f
Branch: refs/heads/ignite-971
Commit: 095d4b3f4060832069f6a20efc27abae885db5c0
Parents: 02d398c
Author: sboikov <sb...@gridgain.com>
Authored: Mon Sep 14 11:33:22 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Sep 14 11:33:22 2015 +0300
----------------------------------------------------------------------
.../distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/095d4b3f/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java
index 71f764b..9e903d1 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java
@@ -185,6 +185,8 @@ public class IgniteCacheQueryNodeRestartSelfTest2 extends GridCommonAbstractTest
* @throws Exception If failed.
*/
public void testRestarts() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-1452");
+
int duration = 90 * 1000;
int qryThreadNum = 4;
int restartThreadsNum = 2; // 4 + 2 = 6 nodes
[4/5] ignite git commit: Minor.
Posted by sb...@apache.org.
Minor.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b4c515e6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b4c515e6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b4c515e6
Branch: refs/heads/ignite-971
Commit: b4c515e62bc8412a2859a5a771ef3c4b38691529
Parents: 095d4b3
Author: sboikov <sb...@gridgain.com>
Authored: Mon Sep 14 11:37:36 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Sep 14 11:37:36 2015 +0300
----------------------------------------------------------------------
.../dht/GridCacheTxNodeFailureSelfTest.java | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b4c515e6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
index 1135c40..dc78003 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheTxNodeFailureSelfTest.java
@@ -36,8 +36,10 @@ import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.lang.IgniteInClosure;
import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.spi.IgniteSpiException;
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.apache.ignite.transactions.Transaction;
@@ -59,6 +61,9 @@ import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_REA
*/
@SuppressWarnings("unchecked")
public class GridCacheTxNodeFailureSelfTest extends GridCommonAbstractTest {
+ /** */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
/**
* @return Grid count.
*/
@@ -70,6 +75,8 @@ public class GridCacheTxNodeFailureSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+ ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(IP_FINDER);
+
cfg.setCacheConfiguration(cacheConfiguration(gridName));
cfg.setCommunicationSpi(new BanningCommunicationSpi());
@@ -202,9 +209,8 @@ public class GridCacheTxNodeFailureSelfTest extends GridCommonAbstractTest {
final CountDownLatch commitLatch = new CountDownLatch(1);
- if (!commit) {
+ if (!commit)
communication(1).bannedClasses(Collections.<Class>singletonList(GridDhtTxPrepareRequest.class));
- }
else {
if (!backup) {
communication(2).bannedClasses(Collections.<Class>singletonList(GridDhtTxPrepareResponse.class));
@@ -389,12 +395,11 @@ public class GridCacheTxNodeFailureSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override public void sendMessage(ClusterNode node, Message msg, IgniteInClosure<IgniteException> ackClosure) throws IgniteSpiException {
+ @Override public void sendMessage(ClusterNode node, Message msg, IgniteInClosure<IgniteException> ackC) {
GridIoMessage ioMsg = (GridIoMessage)msg;
- if (!bannedClasses.contains(ioMsg.message().getClass())) {
- super.sendMessage(node, msg, ackClosure);
- }
+ if (!bannedClasses.contains(ioMsg.message().getClass()))
+ super.sendMessage(node, msg, ackC);
}
}
}