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/01 12:24:14 UTC
[1/4] ignite git commit: ignite-1.5 Muted test
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 e59b0f6d6 -> 9b3cc9565
ignite-1.5 Muted test
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fb4ef34a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fb4ef34a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fb4ef34a
Branch: refs/heads/ignite-1537
Commit: fb4ef34a5e0f7d70674d8cbe3522955ca420c61c
Parents: b64100a
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 1 12:53:34 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 1 12:53:34 2015 +0300
----------------------------------------------------------------------
...ridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fb4ef34a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
index cb40397..3122fe3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest.java
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.configuration.CacheConfiguration;
/**
- * TODO: IGNITE-809.
+ *
*/
public class GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest extends GridCacheMultinodeUpdateNearEnabledSelfTest {
/** {@inheritDoc} */
@@ -36,4 +36,9 @@ public class GridCacheMultinodeUpdateNearEnabledNoBackupsSelfTest extends GridCa
return ccfg;
}
-}
\ No newline at end of file
+
+ /** {@inheritDoc} */
+ @Override public void testInvoke() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-809");
+ }
+}
[2/4] ignite git commit: ignite-1.5 Disabled shmem in test.
Posted by sb...@apache.org.
ignite-1.5 Disabled shmem in test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e11e4cb5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e11e4cb5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e11e4cb5
Branch: refs/heads/ignite-1537
Commit: e11e4cb5362899f9f5429cbb4683063ad036b8cd
Parents: fb4ef34
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 1 13:36:52 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 1 13:36:52 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/IgniteCacheAbstractTest.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e11e4cb5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
index 164ac66..7df72f0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
@@ -33,6 +33,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.lang.IgniteBiInClosure;
+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;
@@ -88,6 +89,8 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
+ ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1);
+
TcpDiscoverySpi disco = new TcpDiscoverySpi().setForceServerMode(true);
disco.setMaxMissedHeartbeats(Integer.MAX_VALUE);
[4/4] 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
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9b3cc956
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9b3cc956
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9b3cc956
Branch: refs/heads/ignite-1537
Commit: 9b3cc956501256bbb7716e9717a280b150c1f92b
Parents: e59b0f6 c850ae4
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 1 14:23:57 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 1 14:23:57 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java | 4 ++--
.../internal/processors/cache/IgniteCacheAbstractTest.java | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/4] ignite git commit: ignite-1.5 Correction for commit 59f3726.
Posted by sb...@apache.org.
ignite-1.5 Correction for commit 59f3726.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c850ae47
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c850ae47
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c850ae47
Branch: refs/heads/ignite-1537
Commit: c850ae474e1d60bf4e927206b580af19e7f208bb
Parents: e11e4cb
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 1 14:17:59 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 1 14:17:59 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c850ae47/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index e5885a6..09e4877 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -360,7 +360,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
clients.remove(id, rmv)) {
rmv.forceClose();
- if (!isNodeStopping()) {
+ if (!stopping) {
GridNioRecoveryDescriptor recoveryData = ses.recoveryDescriptor();
if (recoveryData != null) {
@@ -1761,7 +1761,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
/** {@inheritDoc} */
@Override public void spiStop() throws IgniteSpiException {
- assert isNodeStopping();
+ assert stopping;
unregisterMBean();