You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2015/11/09 18:49:26 UTC
[1/3] ignite git commit: Ignite-1093 Backward compatibility fix.
Repository: ignite
Updated Branches:
refs/heads/ignite-426-2 e90fc9f22 -> b749b3d7a
Ignite-1093 Backward compatibility fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ee5a50f4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ee5a50f4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ee5a50f4
Branch: refs/heads/ignite-426-2
Commit: ee5a50f4b3124219f3fe2700cccaf64c6d031eb1
Parents: efc79fb
Author: Anton Vinogradov <av...@apache.org>
Authored: Mon Nov 9 18:11:43 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Mon Nov 9 18:11:43 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/preloader/GridDhtPreloader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ee5a50f4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index c634ff5..8e56c2d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -207,7 +207,7 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
});
supplier = new GridDhtPartitionSupplier(cctx);
- demander = new GridDhtPartitionDemander(cctx, busyLock);
+ demander = new GridDhtPartitionDemander(cctx, demandLock);
supplier.start();
demander.start();
[2/3] ignite git commit: Merge branch 'master' into ignite-426-2
Posted by nt...@apache.org.
Merge branch 'master' into ignite-426-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aa222025
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aa222025
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aa222025
Branch: refs/heads/ignite-426-2
Commit: aa2220251fc4f03e1d79af8f002785a992eb1c86
Parents: e90fc9f ee5a50f
Author: Tikhonov Nikolay <ti...@gmail.com>
Authored: Mon Nov 9 20:05:56 2015 +0300
Committer: Tikhonov Nikolay <ti...@gmail.com>
Committed: Mon Nov 9 20:05:56 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/preloader/GridDhtPreloader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] ignite git commit: IGNITE-462 Fixed tests.
Posted by nt...@apache.org.
IGNITE-462 Fixed tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b749b3d7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b749b3d7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b749b3d7
Branch: refs/heads/ignite-426-2
Commit: b749b3d7a8359ede13650a359b4cb969304f6e2a
Parents: aa22202
Author: Tikhonov Nikolay <ti...@gmail.com>
Authored: Mon Nov 9 20:52:28 2015 +0300
Committer: Tikhonov Nikolay <ti...@gmail.com>
Committed: Mon Nov 9 20:52:28 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/GridDhtPartitionTopologyImpl.java | 2 +-
.../CacheContinuousQueryFailoverAbstractSelfTest.java | 9 ---------
.../GridCacheContinuousQueryAbstractSelfTest.java | 6 ------
3 files changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b749b3d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index b835df2..39c55db 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -1355,7 +1355,7 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
List<ClusterNode> affNodes = cctx.affinity().nodes(i, topVer);
// Topology doesn't contain server nodes (just clients).
- if (affNodes.isEmpty())
+ if (affNodes.isEmpty() || (node2part != null && !node2part.valid()))
continue;
List<ClusterNode> owners = owners(i);
http://git-wip-us.apache.org/repos/asf/ignite/blob/b749b3d7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
index e82c673..b311272 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java
@@ -271,15 +271,6 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC
waitRebalanceFinished(ignite0, 5);
waitRebalanceFinished(ignite2, 5);
waitRebalanceFinished(ignite3, 5);
-
- stopGrid(3);
-
- assertTrue(top0.rebalanceFinished(new AffinityTopologyVersion(6)));
- assertTrue(top2.rebalanceFinished(new AffinityTopologyVersion(6)));
-
- stopGrid(0);
-
- waitRebalanceFinished(ignite2, 7);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/b749b3d7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 251cbe2..f7a080a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -193,12 +193,6 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
}
}
- for (int i = 0; i < gridCount(); i++)
- assertEquals("Cache is not empty [entrySet=" + grid(i).cache(null).localEntries() +
- ", i=" + i + ']',
- 0, grid(i).cache(null).localSize());
-
-
for (int i = 0; i < gridCount(); i++) {
GridContinuousProcessor proc = grid(i).context().continuous();