You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dm...@apache.org on 2017/05/26 21:27:31 UTC
ignite git commit: IGNITE-5295: NPE when Persistent Store is used and
Memory Configuration is missing
Repository: ignite
Updated Branches:
refs/heads/ignite-5267 3450241fb -> c68b61d3c
IGNITE-5295: NPE when Persistent Store is used and Memory Configuration is missing
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c68b61d3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c68b61d3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c68b61d3
Branch: refs/heads/ignite-5267
Commit: c68b61d3c3229c1c473cf06023df2ffe6d5aa547
Parents: 3450241
Author: Sergey Chugunov <se...@gmail.com>
Authored: Fri May 26 14:27:27 2017 -0700
Committer: Denis Magda <dm...@gridgain.com>
Committed: Fri May 26 14:27:27 2017 -0700
----------------------------------------------------------------------
.../processors/cache/GridCacheProcessor.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c68b61d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index d7c1e3d..bed0601 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -420,7 +420,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (storesLocallyOnClient(c, cc))
throw new IgniteCheckedException("MemoryPolicy for client caches must be explicitly configured " +
- "on client node startup. Use MemoryConfiguration to configure MemoryPolicy.");
+ "on client node startup. Use MemoryConfiguration to configure MemoryPolicy.");
if (cc.getCacheMode() == LOCAL && !cc.getAffinity().getClass().equals(LocalAffinityFunction.class))
U.warn(log, "AffinityFunction configuration parameter will be ignored for local cache [cacheName=" +
@@ -2075,11 +2075,19 @@ public class GridCacheProcessor extends GridProcessorAdapter {
IgniteWriteAheadLogManager walMgr = null;
if (ctx.config().isPersistentStoreEnabled()) {
- dbMgr = IgniteComponentType.DATABASE_MANAGER.create(ctx, false);
+ if (ctx.clientNode()) {
+ U.warn(log, "Persistent Store is not supported on client nodes (Persistent Store's" +
+ " configuration will be ignored).");
- pageStoreMgr = IgniteComponentType.PAGE_STORE_MANAGER.create(ctx, false);
+ dbMgr = new IgniteCacheDatabaseSharedManager();
+ }
+ else {
+ dbMgr = IgniteComponentType.DATABASE_MANAGER.create(ctx, false);
- walMgr = IgniteComponentType.WAL_MANAGER.create(ctx, false);
+ pageStoreMgr = IgniteComponentType.PAGE_STORE_MANAGER.create(ctx, false);
+
+ walMgr = IgniteComponentType.WAL_MANAGER.create(ctx, false);
+ }
}
else
dbMgr = new IgniteCacheDatabaseSharedManager();