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/07/21 10:13:20 UTC
[1/8] incubator-ignite git commit: 1.4.1-SNAPSHOT
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-752 05f69a6a6 -> 49098e93e
1.4.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0ac5fe75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0ac5fe75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0ac5fe75
Branch: refs/heads/ignite-752
Commit: 0ac5fe7565a709b666c9d225574cca5bfbb38a95
Parents: cf08181
Author: Ignite Teamcity <ig...@apache.org>
Authored: Mon Jul 20 13:59:53 2015 +0300
Committer: Ignite Teamcity <ig...@apache.org>
Committed: Mon Jul 20 13:59:53 2015 +0300
----------------------------------------------------------------------
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ac5fe75/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a6ca9f5..2ae259c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -607,12 +607,12 @@
</copy>
<!-- appending filename to md5 and sha1 files. to be improved. -->
- <echo file="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.md5" append="true" message=" ${project.artifactId}-fabric-${project.version}-bin.zip" />
- <echo file="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.sha1" append="true" message=" ${project.artifactId}-fabric-${project.version}-bin.zip" />
- <echo file="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.md5" append="true" message=" ${project.artifactId}-hadoop-${project.version}-bin.zip" />
- <echo file="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.sha1" append="true" message=" ${project.artifactId}-hadoop-${project.version}-bin.zip" />
- <echo file="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.md5" append="true" message=" ${project.artifactId}-${project.version}-src.zip" />
- <echo file="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.sha1" append="true" message=" ${project.artifactId}-${project.version}-src.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.md5" append="true" message=" ${project.artifactId}-fabric-${project.version}-bin.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-fabric-${project.version}-bin.zip.sha1" append="true" message=" ${project.artifactId}-fabric-${project.version}-bin.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.md5" append="true" message=" ${project.artifactId}-hadoop-${project.version}-bin.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-hadoop-${project.version}-bin.zip.sha1" append="true" message=" ${project.artifactId}-hadoop-${project.version}-bin.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.md5" append="true" message=" ${project.artifactId}-${project.version}-src.zip" />
+ <echo file="${basedir}/target/site/${project.artifactId}-${project.version}-src.zip.sha1" append="true" message=" ${project.artifactId}-${project.version}-src.zip" />
</target>
</configuration>
</execution>
[4/8] incubator-ignite git commit: #master: fix affinityCall tests.
Posted by sb...@apache.org.
#master: fix affinityCall tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7ae5ce63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7ae5ce63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7ae5ce63
Branch: refs/heads/ignite-752
Commit: 7ae5ce63fa09da0f3b9c25f77090f8091c6455a5
Parents: 3194415
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Jul 20 18:25:35 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Jul 20 18:25:35 2015 +0300
----------------------------------------------------------------------
.../processors/cache/CacheAffinityCallSelfTest.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ae5ce63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
index c4436ca..90160e1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
@@ -45,7 +45,7 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest {
private static final String CACHE_NAME = "myCache";
/** */
- private static final int MAX_FAILOVER_ATTEMPTS = 5;
+ private static final int MAX_FAILOVER_ATTEMPTS = 105;
/** */
private static final int SERVERS_COUNT = 4;
@@ -81,7 +81,7 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTest() throws Exception {
+ @Override protected void afterTestsStopped() throws Exception {
stopAllGrids();
}
@@ -138,10 +138,16 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest {
assertTrue(e.getMessage().contains("Topology projection is empty"));
}
catch(IgniteException e) {
- assertTrue(e.getMessage().contains("cache (or node) is stopping"));
+ assertTrue(e.getMessage().contains("Client node disconnected") ||
+ e.getMessage().contains("Failed to reconnect to cluster") ||
+ e.getMessage().contains("Failed to execute task, client node disconnected."));
}
+ startGrid(0);
+
stopGrid(SERVERS_COUNT);
+
+ stopGrid(0);
}
/**
[6/8] incubator-ignite git commit: # ignite-1134 avoid hang on nio
session send after nio server stop
Posted by sb...@apache.org.
# ignite-1134 avoid hang on nio session send after nio server stop
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/79712aa2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/79712aa2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/79712aa2
Branch: refs/heads/ignite-752
Commit: 79712aa2ee30ccff6d7e30e7ed13707d6bad40bf
Parents: f62744e
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jul 21 10:45:39 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jul 21 10:45:39 2015 +0300
----------------------------------------------------------------------
.../distributed/dht/GridDhtTxPrepareFuture.java | 7 +-
.../ignite/internal/util/nio/GridNioServer.java | 9 ++
.../util/nio/GridSelectorNioSessionImpl.java | 8 ++
.../internal/util/nio/GridNioSelfTest.java | 88 ++++++++++++++++++--
.../internal/util/nio/GridNioSslSelfTest.java | 16 ++--
5 files changed, 107 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79712aa2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 6efa4d8..fbc8c84 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -880,7 +880,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
fut.onNodeLeft(e);
}
catch (IgniteCheckedException e) {
- fut.onResult(e);
+ if (!cctx.kernalContext().isStopping())
+ fut.onResult(e);
}
}
@@ -927,7 +928,6 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
assert req.transactionNodes() != null;
- //noinspection TryWithIdenticalCatches
try {
cctx.io().send(nearMapping.node(), req, tx.system() ? UTILITY_CACHE_POOL : SYSTEM_POOL);
}
@@ -935,7 +935,8 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
fut.onNodeLeft(e);
}
catch (IgniteCheckedException e) {
- fut.onResult(e);
+ if (!cctx.kernalContext().isStopping())
+ fut.onResult(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79712aa2/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 24e1e08..b36f9f5 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
@@ -311,6 +311,9 @@ public class GridNioServer<T> {
U.join(clientWorkers, log);
filterChain.stop();
+
+ for (GridSelectorNioSessionImpl ses : sessions)
+ ses.onServerStopped();
}
}
@@ -1496,6 +1499,9 @@ public class GridNioServer<T> {
req.onDone(e);
}
+
+ if (closed)
+ ses.onServerStopped();
}
catch (ClosedChannelException e) {
U.warn(log, "Failed to register accepted socket channel to selector (channel was closed): "
@@ -1525,6 +1531,9 @@ 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.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79712aa2/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 cf240ca..458786b 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
@@ -290,6 +290,14 @@ class GridSelectorNioSessionImpl extends GridNioSessionImpl {
return super.addMeta(key, val);
}
+ /**
+ *
+ */
+ void onServerStopped() {
+ if (sem != null)
+ sem.release(1_000_000);
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(GridSelectorNioSessionImpl.class, this, super.toString());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79712aa2/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
index c81ed56..fa8d4a0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java
@@ -393,6 +393,62 @@ public class GridNioSelfTest extends GridCommonAbstractTest {
}
/**
+ * @throws Exception If failed.
+ */
+ public void testSendAfterServerStop() throws Exception {
+ final AtomicReference<GridNioSession> sesRef = new AtomicReference<>();
+
+ final CountDownLatch connectLatch = new CountDownLatch(1);
+
+ GridNioServerListener lsnr = new GridNioServerListenerAdapter() {
+ @Override public void onConnected(GridNioSession ses) {
+ info("On connected: " + ses);
+
+ sesRef.set(ses);
+
+ connectLatch.countDown();
+ }
+
+ @Override public void onDisconnected(GridNioSession ses, @Nullable Exception e) {
+ }
+
+ @Override public void onMessage(GridNioSession ses, Object msg) {
+ log.info("Message: " + msg);
+ }
+ };
+
+ GridNioServer.Builder<?> builder = serverBuilder(PORT, new GridPlainParser(), lsnr);
+
+ GridNioServer<?> srvr = builder.sendQueueLimit(5).build();
+
+ srvr.start();
+
+ try {
+ Socket s = createSocket();
+
+ s.connect(new InetSocketAddress(U.getLocalHost(), PORT), 1000);
+
+ s.getOutputStream().write(new byte[1]);
+
+ U.await(connectLatch);
+
+ GridNioSession ses = sesRef.get();
+
+ assertNotNull(ses);
+
+ ses.send(new byte[1]);
+
+ srvr.stop();
+
+ for (int i = 0; i < 10; i++)
+ ses.send(new byte[1]);
+ }
+ finally {
+ srvr.stop();
+ }
+ }
+
+ /**
* Sends message and validates reply.
*
* @param msg Message to send.
@@ -480,10 +536,29 @@ public class GridNioSelfTest extends GridCommonAbstractTest {
* @return Started server.
* @throws Exception If failed.
*/
- @SuppressWarnings("unchecked")
- protected GridNioServer<?> startServer(int port, GridNioParser parser, GridNioServerListener lsnr)
+ protected final GridNioServer<?> startServer(int port, GridNioParser parser, GridNioServerListener lsnr)
throws Exception {
- GridNioServer<?> srvr = GridNioServer.builder()
+ GridNioServer<?> srvr = serverBuilder(port, parser, lsnr).build();
+
+ srvr.start();
+
+ return srvr;
+ }
+
+ /**
+ * @param port Port to listen.
+ * @param parser Parser to use.
+ * @param lsnr Listener.
+ * @return Server builder.
+ * @throws Exception If failed.
+ */
+ @SuppressWarnings("unchecked")
+ protected GridNioServer.Builder<?> serverBuilder(int port,
+ GridNioParser parser,
+ GridNioServerListener lsnr)
+ throws Exception
+ {
+ return GridNioServer.builder()
.address(U.getLocalHost())
.port(port)
.listener(lsnr)
@@ -496,12 +571,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest {
.socketSendBufferSize(0)
.socketReceiveBufferSize(0)
.sendQueueLimit(0)
- .filters(new GridNioCodecFilter(parser, log, false))
- .build();
-
- srvr.start();
-
- return srvr;
+ .filters(new GridNioCodecFilter(parser, log, false));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79712aa2/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java
index 930b5d1..73f5ba5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSslSelfTest.java
@@ -52,9 +52,12 @@ public class GridNioSslSelfTest extends GridNioSelfTest {
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- @Override protected GridNioServer<?> startServer(int port, GridNioParser parser, GridNioServerListener lsnr)
- throws Exception {
- GridNioServer<?> srvr = GridNioServer.builder()
+ @Override protected GridNioServer.Builder<?> serverBuilder(int port,
+ GridNioParser parser,
+ GridNioServerListener lsnr)
+ throws Exception
+ {
+ return GridNioServer.builder()
.address(U.getLocalHost())
.port(port)
.listener(lsnr)
@@ -69,12 +72,7 @@ public class GridNioSslSelfTest extends GridNioSelfTest {
.sendQueueLimit(0)
.filters(
new GridNioCodecFilter(parser, log, false),
- new GridNioSslFilter(sslCtx, log))
- .build();
-
- srvr.start();
-
- return srvr;
+ new GridNioSslFilter(sslCtx, log));
}
/** {@inheritDoc} */
[8/8] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-752
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-752
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/49098e93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/49098e93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/49098e93
Branch: refs/heads/ignite-752
Commit: 49098e93e3d353c72934c3224599a7c59d1ee09a
Parents: 05f69a6 9aa928c
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Jul 21 11:12:42 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Jul 21 11:12:42 2015 +0300
----------------------------------------------------------------------
.../distributed/dht/GridDhtTxPrepareFuture.java | 7 +-
.../ignite/internal/util/nio/GridNioServer.java | 9 ++
.../util/nio/GridSelectorNioSessionImpl.java | 8 ++
.../IgniteClientReconnectFailoverTest.java | 6 ++
.../cache/CacheAffinityCallSelfTest.java | 10 ++-
.../internal/util/nio/GridNioSelfTest.java | 88 ++++++++++++++++++--
.../internal/util/nio/GridNioSslSelfTest.java | 16 ++--
.../testframework/junits/GridAbstractTest.java | 3 +-
pom.xml | 12 +--
9 files changed, 127 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
[3/8] incubator-ignite git commit: Merge remote-tracking branch
'origin/master'
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3194415c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3194415c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3194415c
Branch: refs/heads/ignite-752
Commit: 3194415cdd35827ee9c3e150fdb8c9ca069b37f0
Parents: d623d7e 0ac5fe7
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jul 20 14:43:10 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jul 20 14:43:10 2015 +0300
----------------------------------------------------------------------
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[7/8] incubator-ignite git commit: #master: fix client tests.
Posted by sb...@apache.org.
#master: fix client tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9aa928c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9aa928c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9aa928c2
Branch: refs/heads/ignite-752
Commit: 9aa928c2c0e7fc0f88e347a15d8f404864e97ff2
Parents: 79712aa
Author: ivasilinets <iv...@gridgain.com>
Authored: Tue Jul 21 10:59:11 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Tue Jul 21 10:59:11 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/CacheAffinityCallSelfTest.java | 4 ----
.../org/apache/ignite/testframework/junits/GridAbstractTest.java | 3 ++-
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9aa928c2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
index e107c21..befd8c7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
@@ -143,10 +143,6 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest {
e.getMessage().contains("Failed to execute task, client node disconnected."));
}
- startGrid(0);
-
- U.sleep(3000);
-
stopAllGrids();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9aa928c2/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 9a55ccf..d6591cd 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
@@ -753,7 +753,8 @@ public abstract class GridAbstractTest extends TestCase {
assert ignite != null : "Ignite returned null grid for name: " + gridName;
- info(">>> Stopping grid [name=" + ignite.name() + ", id=" + ignite.cluster().localNode().id() + ']');
+ info(">>> Stopping grid [name=" + ignite.name() + ", id=" +
+ ((IgniteKernal)ignite).context().localNodeId() + ']');
if (!isRemoteJvm(gridName))
G.stop(gridName, cancel);
[2/8] incubator-ignite git commit: # master fixed test
Posted by sb...@apache.org.
# master 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/d623d7e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d623d7e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d623d7e4
Branch: refs/heads/ignite-752
Commit: d623d7e4913998b29a3ba91e78e8409cd1d89d46
Parents: cf08181
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jul 20 14:42:52 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jul 20 14:42:52 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/IgniteClientReconnectFailoverTest.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d623d7e4/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java
index b7de3eb..ab0e726 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverTest.java
@@ -148,6 +148,12 @@ public class IgniteClientReconnectFailoverTest extends IgniteClientReconnectFail
assertEquals(map, res);
}
+ catch (IgniteClientDisconnectedException e) {
+ throw e;
+ }
+ catch (IgniteException e) {
+ log.info("Ignore error: " + e);
+ }
catch (CacheException e) {
if (e.getCause() instanceof IgniteClientDisconnectedException)
throw e;
[5/8] incubator-ignite git commit: #master: fix affinityCall tests.
Posted by sb...@apache.org.
#master: fix affinityCall tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f62744e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f62744e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f62744e0
Branch: refs/heads/ignite-752
Commit: f62744e09e7afad550ddbf4a65e9db5cf883f8ee
Parents: 7ae5ce6
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Jul 20 19:42:05 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Jul 20 19:42:05 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/CacheAffinityCallSelfTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f62744e0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
index 90160e1..e107c21 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
@@ -145,9 +145,9 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest {
startGrid(0);
- stopGrid(SERVERS_COUNT);
+ U.sleep(3000);
- stopGrid(0);
+ stopAllGrids();
}
/**