You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/02/21 16:29:51 UTC
[1/4] ignite git commit: ignite-db-x fix rebalance test,
testOldestChanged, close port if happen exception during start processors
Repository: ignite
Updated Branches:
refs/heads/ignite-3477 7721df275 -> 84df8b32d
ignite-db-x fix rebalance test, testOldestChanged, close port if happen exception during start processors
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1cef4d34
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1cef4d34
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1cef4d34
Branch: refs/heads/ignite-3477
Commit: 1cef4d341cfdd8cfc5f5efffcc3a3cc04ed69e07
Parents: c5aee5b
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Tue Feb 21 17:38:28 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Tue Feb 21 17:38:28 2017 +0300
----------------------------------------------------------------------
.../managers/discovery/GridDiscoveryManager.java | 11 +++++++++++
.../discovery/tcp/internal/TcpDiscoveryNodesRing.java | 3 ++-
.../IgniteDynamicCacheStartNoExchangeTimeoutTest.java | 8 +++++---
.../junits/common/GridCommonAbstractTest.java | 2 +-
4 files changed, 19 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1cef4d34/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 218aff0..7129896 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
@@ -271,6 +271,9 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
/** */
private Object consistentId;
+ /** Discovery spi registered flag. */
+ private boolean registeredDiscoSpi;
+
/** @param ctx Context. */
public GridDiscoveryManager(GridKernalContext ctx) {
super(ctx, ctx.config().getDiscoverySpi());
@@ -702,6 +705,8 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
startSpi();
+ registeredDiscoSpi = true;
+
try {
U.await(startLatch);
}
@@ -1394,6 +1399,12 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
// Stop SPI itself.
stopSpi();
+ // Stop spi if was not add in spi map but port was open.
+ if (!registeredDiscoSpi)
+ getSpi().spiStop();
+
+ registeredDiscoSpi = false;
+
if (log.isDebugEnabled())
log.debug(stopInfo());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/1cef4d34/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
index eb0f74a..54ddc9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
@@ -397,7 +397,8 @@ public class TcpDiscoveryNodesRing {
topVer = 0;
- minNodeVer = locNode.version();
+ if (locNode != null)
+ minNodeVer = locNode.version();
}
finally {
rwLock.writeLock().unlock();
http://git-wip-us.apache.org/repos/asf/ignite/blob/1cef4d34/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java
index 263e9ca..cc2b3d7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartNoExchangeTimeoutTest.java
@@ -249,7 +249,7 @@ public class IgniteDynamicCacheStartNoExchangeTimeoutTest extends GridCommonAbst
ccfg.setNodeFilter(new TestFilterExcludeOldest());
- assertNotNull(ignite0.getOrCreateCache(ccfg));
+ assertNotNull(ignite(1).getOrCreateCache(ccfg));
stopGrid(0);
@@ -276,7 +276,7 @@ public class IgniteDynamicCacheStartNoExchangeTimeoutTest extends GridCommonAbst
ccfg.setNodeFilter(new TestFilterIncludeNode(3));
- assertNotNull(ignite0.getOrCreateCache(ccfg));
+ assertNotNull(ignite(1).getOrCreateCache(ccfg));
stopGrid(0);
@@ -295,11 +295,13 @@ public class IgniteDynamicCacheStartNoExchangeTimeoutTest extends GridCommonAbst
public void testOldestChanged3() throws Exception {
IgniteEx ignite0 = grid(0);
+ assertEquals(1L, ignite0.localNode().order());
+
CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setNodeFilter(new TestFilterIncludeNode(3));
- assertNotNull(ignite0.getOrCreateCache(ccfg));
+ assertNotNull(ignite(1).getOrCreateCache(ccfg));
stopGrid(0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/1cef4d34/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index d82f1ea..480928c 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -565,7 +565,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest {
if (cfg == null)
continue;
- if (cfg.getCacheMode() == PARTITIONED &&
+ if (cfg.getCacheMode() != LOCAL &&
cfg.getRebalanceMode() != NONE &&
g.cluster().nodes().size() > 1) {
AffinityFunction aff = cfg.getAffinity();
[4/4] ignite git commit: IGNITE-3477 - Added assertion
Posted by ag...@apache.org.
IGNITE-3477 - Added assertion
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/84df8b32
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/84df8b32
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/84df8b32
Branch: refs/heads/ignite-3477
Commit: 84df8b32d22335c7ad4f5f9d9298f25c4b7e7208
Parents: 885436c
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Feb 21 19:21:30 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Feb 21 19:21:30 2017 +0300
----------------------------------------------------------------------
.../processors/cache/query/GridCacheDistributedQueryFuture.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/84df8b32/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
index 9d7dbbc..a88a1c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
@@ -270,6 +270,8 @@ public class GridCacheDistributedQueryFuture<K, V, R> extends GridCacheQueryFutu
/** {@inheritDoc} */
@Override void clear() {
+ assert isDone() : this;
+
GridCacheDistributedQueryManager<K, V> qryMgr = (GridCacheDistributedQueryManager<K, V>)cctx.queries();
if (qryMgr != null)
[3/4] ignite git commit: Merge branch 'ignite-db-x' of
https://github.com/gridgain/apache-ignite into ignite-db-x
Posted by ag...@apache.org.
Merge branch 'ignite-db-x' of https://github.com/gridgain/apache-ignite into ignite-db-x
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/885436cc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/885436cc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/885436cc
Branch: refs/heads/ignite-3477
Commit: 885436cc4a7a8e9e1b159ca833268f98d752ef0c
Parents: 7721df2 946e71c
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Feb 21 19:06:47 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Feb 21 19:06:47 2017 +0300
----------------------------------------------------------------------
.../managers/discovery/GridDiscoveryManager.java | 11 +++++++++++
.../cache/query/GridCacheDistributedQueryFuture.java | 5 ++---
.../discovery/tcp/internal/TcpDiscoveryNodesRing.java | 3 ++-
.../IgniteDynamicCacheStartNoExchangeTimeoutTest.java | 8 +++++---
.../junits/common/GridCommonAbstractTest.java | 2 +-
5 files changed, 21 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[2/4] ignite git commit: ignite-db-x fix
GridTcpCommunicationSpiRecoveryFailureDetectionSelfTest.testBlockListener
Posted by ag...@apache.org.
ignite-db-x fix GridTcpCommunicationSpiRecoveryFailureDetectionSelfTest.testBlockListener
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/946e71cf
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/946e71cf
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/946e71cf
Branch: refs/heads/ignite-3477
Commit: 946e71cf56b4b4dd3fd94749c4cddf6fe53caa89
Parents: 1cef4d3
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Tue Feb 21 19:03:44 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Tue Feb 21 19:03:44 2017 +0300
----------------------------------------------------------------------
.../processors/cache/query/GridCacheDistributedQueryFuture.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/946e71cf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
index 6110e0c..9d7dbbc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
@@ -272,8 +272,7 @@ public class GridCacheDistributedQueryFuture<K, V, R> extends GridCacheQueryFutu
@Override void clear() {
GridCacheDistributedQueryManager<K, V> qryMgr = (GridCacheDistributedQueryManager<K, V>)cctx.queries();
- assert qryMgr != null;
-
- qryMgr.removeQueryFuture(reqId);
+ if (qryMgr != null)
+ qryMgr.removeQueryFuture(reqId);
}
}