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/05/06 08:14:16 UTC
[1/4] incubator-ignite git commit: IGNITE-858 - Fixed NPE
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-157-2 42563f6c1 -> b141abfd5
IGNITE-858 - Fixed NPE
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/396f2f31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/396f2f31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/396f2f31
Branch: refs/heads/ignite-157-2
Commit: 396f2f31207e9fa5133e2a669d50f3d998fae2f3
Parents: c4bc929
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Mon May 4 17:32:15 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Mon May 4 17:32:15 2015 -0700
----------------------------------------------------------------------
.../processors/cache/GridCachePartitionExchangeManager.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/396f2f31/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 5f82ae2..61ea0a9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -745,6 +745,9 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
int skipped = 0;
for (GridDhtPartitionsExchangeFuture fut : exchFuts0.values()) {
+ if (exchFut.exchangeId().topologyVersion().compareTo(fut.exchangeId().topologyVersion()) < 0)
+ continue;
+
skipped++;
if (skipped == EXCH_FUT_CLEANUP_HISTORY_SIZE) {
[3/4] incubator-ignite git commit: Merge branches 'ignite-858' and
'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-sprint-4
Posted by sb...@apache.org.
Merge branches 'ignite-858' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/07a4258d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/07a4258d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/07a4258d
Branch: refs/heads/ignite-157-2
Commit: 07a4258d9ac04f36536122827c423ebb2e8cd70f
Parents: 54f9492 4a7d43a
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Tue May 5 16:00:39 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Tue May 5 16:00:39 2015 -0700
----------------------------------------------------------------------
.../processors/cache/GridCachePartitionExchangeManager.java | 3 +++
.../cache/distributed/dht/GridCacheDhtPreloadSelfTest.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/4] incubator-ignite git commit: IGNITE-858 - Fixed preload test
Posted by sb...@apache.org.
IGNITE-858 - Fixed preload 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/4a7d43a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4a7d43a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4a7d43a2
Branch: refs/heads/ignite-157-2
Commit: 4a7d43a201c584bb2f20fa8f8cf5c5a6d467b7b0
Parents: 396f2f3
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Tue May 5 11:34:13 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Tue May 5 11:34:13 2015 -0700
----------------------------------------------------------------------
.../cache/distributed/dht/GridCacheDhtPreloadSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a7d43a2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
index f04b87f..5b63c6a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
@@ -266,7 +266,7 @@ public class GridCacheDhtPreloadSelfTest extends GridCommonAbstractTest {
ClusterNode node = evt.discoveryNode();
return evt.type() == EVT_CACHE_REBALANCE_STOPPED && node.id().equals(nodeId) &&
- evt.discoveryEventType() == EVT_NODE_LEFT;
+ (evt.discoveryEventType() == EVT_NODE_LEFT || evt.discoveryEventType() == EVT_NODE_FAILED);
}
}, EVT_CACHE_REBALANCE_STOPPED));
[4/4] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-4' into ignite-157-2
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-157-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b141abfd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b141abfd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b141abfd
Branch: refs/heads/ignite-157-2
Commit: b141abfd5c4c4219d17e6a1cc1a7a1677b06b3c0
Parents: 42563f6 07a4258
Author: sboikov <sb...@gridgain.com>
Authored: Wed May 6 09:12:56 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed May 6 09:12:56 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCachePartitionExchangeManager.java | 3 +++
.../cache/distributed/dht/GridCacheDhtPreloadSelfTest.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------