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/01/18 18:13:57 UTC
[1/5] ignite git commit: ignite-gg-8.0.2.ea2 ifgs test fix
Repository: ignite
Updated Branches:
refs/heads/ignite-3477 b8d435b6f -> f6011a5cf
ignite-gg-8.0.2.ea2 ifgs test fix
(cherry picked from commit 8e7fade)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f4a4e7c5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f4a4e7c5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f4a4e7c5
Branch: refs/heads/ignite-3477
Commit: f4a4e7c59a9bca50ce517611a78fa4b5fc719ac0
Parents: b721d73d
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Wed Jan 18 19:00:36 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Wed Jan 18 21:11:22 2017 +0300
----------------------------------------------------------------------
.../cluster/GridClusterStateProcessor.java | 15 +++++++++------
.../processors/igfs/IgfsProcessorSelfTest.java | 2 +-
2 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f4a4e7c5/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
index fa6910d..8d16d14 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
@@ -43,6 +43,7 @@ import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.cluster.ClusterGroupAdapter;
import org.apache.ignite.internal.managers.discovery.CustomEventListener;
import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
+import org.apache.ignite.internal.pagemem.store.IgnitePageStoreManager;
import org.apache.ignite.internal.processors.GridProcessorAdapter;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.ClusterState;
@@ -440,8 +441,10 @@ public class GridClusterStateProcessor extends GridProcessorAdapter {
if (!client) {
sharedCtx.database().lock();
- if (sharedCtx.pageStore() != null)
- sharedCtx.pageStore().onActivate(ctx);
+ IgnitePageStoreManager pageStore = sharedCtx.pageStore();
+
+ if (pageStore != null)
+ pageStore.onActivate(ctx);
sharedCtx.wal().onActivate(ctx);
@@ -449,14 +452,14 @@ public class GridClusterStateProcessor extends GridProcessorAdapter {
for (CacheConfiguration cfg : cfgs) {
if (CU.isSystemCache(cfg.getName()))
- if (sharedCtx.pageStore() != null)
- sharedCtx.pageStore().initializeForCache(cfg);
+ if (pageStore != null)
+ pageStore.initializeForCache(cfg);
}
for (CacheConfiguration cfg : cfgs) {
if (!CU.isSystemCache(cfg.getName()))
- if (sharedCtx.pageStore() != null)
- sharedCtx.pageStore().initializeForCache(cfg);
+ if (pageStore != null)
+ pageStore.initializeForCache(cfg);
}
sharedCtx.database().onActivate(ctx);
http://git-wip-us.apache.org/repos/asf/ignite/blob/f4a4e7c5/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
index c854970..69d11ad 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
@@ -230,7 +230,7 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
for (int i = 0; i < nodesCount(); i++) {
IgfsEntryInfo fileInfo =
- (IgfsEntryInfo)grid(i).cachex(metaCacheName).localPeek(info.fileId(), ONHEAP_PEEK_MODES, null);
+ (IgfsEntryInfo)grid(i).cachex(metaCacheName).localPeek(info.fileId(), null, null);
assertNotNull(fileInfo);
assertNotNull(fileInfo.listing());
[3/5] ignite git commit: ignite-gg-8.0.2.ea2 fix
GridPartitionedBackupLoadSelfTest.testBackupLoad
Posted by ag...@apache.org.
ignite-gg-8.0.2.ea2 fix GridPartitionedBackupLoadSelfTest.testBackupLoad
(cherry picked from commit fc7af86)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ea848154
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ea848154
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ea848154
Branch: refs/heads/ignite-3477
Commit: ea848154cbca1ed0b99d2495f6fe60a10dec862c
Parents: 93e497f
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Wed Jan 18 19:49:04 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Wed Jan 18 21:11:46 2017 +0300
----------------------------------------------------------------------
.../distributed/near/GridPartitionedBackupLoadSelfTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ea848154/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
index 5c3eacf..af0e062 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridPartitionedBackupLoadSelfTest.java
@@ -111,11 +111,11 @@ public class GridPartitionedBackupLoadSelfTest extends GridCommonAbstractTest {
IgniteCache<Integer, Integer> cache = jcache(i);
if (grid(i).affinity(null).isBackup(grid(i).localNode(), 1)) {
- assert cache.localPeek(1, CachePeekMode.ONHEAP) == 1;
+ assert cache.localPeek(1) == 1;
jcache(i).localClear(1);
- assert cache.localPeek(1, CachePeekMode.ONHEAP) == null;
+ assert cache.localPeek(1) == null;
// Store is called in putx method, so we reset counter here.
cnt.set(0);
[5/5] 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/f6011a5c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f6011a5c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f6011a5c
Branch: refs/heads/ignite-3477
Commit: f6011a5cfcc79589601c9f612964acd332b2c673
Parents: b8d435b 8764930
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Wed Jan 18 21:13:28 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Jan 18 21:13:28 2017 +0300
----------------------------------------------------------------------
.../cluster/GridClusterStateProcessor.java | 15 +++++++++------
.../CacheExchangeMessageDuplicatedStateTest.java | 8 ++++----
.../dht/GridCacheDhtPreloadDisabledSelfTest.java | 8 ++++----
.../near/GridPartitionedBackupLoadSelfTest.java | 4 ++--
.../processors/igfs/IgfsProcessorSelfTest.java | 2 +-
5 files changed, 20 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f6011a5c/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
index f3952ed,8d16d14..87d54a1
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
@@@ -441,11 -441,12 +442,13 @@@ public class GridClusterStateProcessor
if (!client) {
sharedCtx.database().lock();
- if (sharedCtx.pageStore() != null)
- sharedCtx.pageStore().onActivate(ctx);
+ IgnitePageStoreManager pageStore = sharedCtx.pageStore();
+
+ if (pageStore != null)
+ pageStore.onActivate(ctx);
- sharedCtx.wal().onActivate(ctx);
+ if (sharedCtx.wal() != null)
+ sharedCtx.wal().onActivate(ctx);
sharedCtx.database().initDataBase();
[2/5] ignite git commit: ignite-gg-8.0.2.ea2 fix
CacheExchangeMessageDuplicatedStateTest.testExchangeMessages
Posted by ag...@apache.org.
ignite-gg-8.0.2.ea2 fix CacheExchangeMessageDuplicatedStateTest.testExchangeMessages
(cherry picked from commit 0d71009)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/93e497fb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/93e497fb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/93e497fb
Branch: refs/heads/ignite-3477
Commit: 93e497fb999fa2d36619bd62bb921392c1d62ec7
Parents: f4a4e7c
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Wed Jan 18 19:46:57 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Wed Jan 18 21:11:35 2017 +0300
----------------------------------------------------------------------
.../cache/CacheExchangeMessageDuplicatedStateTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/93e497fb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
index ed186ac..ac7222a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
@@ -93,25 +93,25 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT
{
CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setName(AFF1_CACHE1);
- ccfg.setAffinity(new RendezvousAffinityFunction());
+ ccfg.setAffinity(new RendezvousAffinityFunction(false,512));
ccfgs.add(ccfg);
}
{
CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setName(AFF1_CACHE2);
- ccfg.setAffinity(new RendezvousAffinityFunction());
+ ccfg.setAffinity(new RendezvousAffinityFunction(false,512));
ccfgs.add(ccfg);
}
{
CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setName(AFF2_CACHE1);
- ccfg.setAffinity(new FairAffinityFunction());
+ ccfg.setAffinity(new FairAffinityFunction(false,512));
ccfgs.add(ccfg);
}
{
CacheConfiguration ccfg = new CacheConfiguration();
ccfg.setName(AFF2_CACHE2);
- ccfg.setAffinity(new FairAffinityFunction());
+ ccfg.setAffinity(new FairAffinityFunction(false,512));
ccfgs.add(ccfg);
}
{
[4/5] ignite git commit: ignite-gg-8.0.2.ea2 localPeek
Posted by ag...@apache.org.
ignite-gg-8.0.2.ea2 localPeek
(cherry picked from commit 5b010c2)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8764930a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8764930a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8764930a
Branch: refs/heads/ignite-3477
Commit: 8764930adb0cfa451db8f2beffa7d0467670bd6f
Parents: ea84815
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Wed Jan 18 20:58:44 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Wed Jan 18 21:12:00 2017 +0300
----------------------------------------------------------------------
.../distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8764930a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
index 52f31d5..61c7d37 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
@@ -188,7 +188,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest
assertNull(near(cache1).peekEx(i));
assertNotNull((dht(cache1).peekEx(i)));
- assertEquals(Integer.toString(i), cache1.localPeek(i, CachePeekMode.ONHEAP));
+ assertEquals(Integer.toString(i), cache1.localPeek(i));
}
int nodeCnt = 3;
@@ -202,7 +202,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest
IgniteCache<Integer, String> c = g.cache(null);
for (int i = 0; i < keyCnt; i++)
- assertNull(c.localPeek(i, CachePeekMode.ONHEAP));
+ assertNull(c.localPeek(i));
}
Collection<Integer> keys = new LinkedList<>();
@@ -226,12 +226,12 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest
IgniteCache<Integer, String> c = gg.cache(null);
for (int i = 0; i < keyCnt; i++)
- assertNull(c.localPeek(i, CachePeekMode.ONHEAP));
+ assertNull(c.localPeek(i));
}
}
for (Integer i : keys)
- assertEquals(i.toString(), cache1.localPeek(i, CachePeekMode.ONHEAP));
+ assertEquals(i.toString(), cache1.localPeek(i));
}
catch (Error | Exception e) {
error("Test failed.", e);