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 2018/06/09 20:28:04 UTC
[4/5] ignite git commit: IGNITE-8682 Attempt to configure IGFS in
persistent mode without specific data region ends with AssertionError
IGNITE-8682 Attempt to configure IGFS in persistent mode without specific data region ends with AssertionError
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0121329f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0121329f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0121329f
Branch: refs/heads/ignite-2.6
Commit: 0121329f3e6247a3047a91a123f127babdc6e0c8
Parents: 2ff1a7e
Author: Ivan Rakov <ir...@apache.org>
Authored: Tue Jun 5 14:42:43 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Sat Jun 9 23:25:36 2018 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheProcessor.java | 9 ++++++---
.../internal/processors/cache/GridCacheUtils.java | 12 +++++++++++-
.../persistence/IgniteCacheDatabaseSharedManager.java | 2 +-
3 files changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0121329f/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 b8e1bcf..1fbeba6 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
@@ -2022,22 +2022,25 @@ public class GridCacheProcessor extends GridProcessorAdapter {
String memPlcName = cfg.getDataRegionName();
- DataRegion memPlc = sharedCtx.database().dataRegion(memPlcName);
+ DataRegion dataRegion = sharedCtx.database().dataRegion(memPlcName);
FreeList freeList = sharedCtx.database().freeList(memPlcName);
ReuseList reuseList = sharedCtx.database().reuseList(memPlcName);
+ boolean persistenceEnabled = sharedCtx.localNode().isClient() ? desc.persistenceEnabled() :
+ dataRegion != null && dataRegion.config().isPersistenceEnabled();
+
CacheGroupContext grp = new CacheGroupContext(sharedCtx,
desc.groupId(),
desc.receivedFrom(),
cacheType,
cfg,
affNode,
- memPlc,
+ dataRegion,
cacheObjCtx,
freeList,
reuseList,
exchTopVer,
- desc.persistenceEnabled(),
+ persistenceEnabled,
desc.walEnabled()
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/0121329f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index bb64cc6..4f349a4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -119,6 +119,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC
import static org.apache.ignite.configuration.CacheConfiguration.DFLT_CACHE_MODE;
import static org.apache.ignite.internal.GridTopic.TOPIC_REPLICATION;
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.READ;
+import static org.apache.ignite.internal.processors.cache.persistence.IgniteCacheDatabaseSharedManager.SYSTEM_DATA_REGION_NAME;
/**
* Cache utility methods.
@@ -1800,7 +1801,7 @@ public class GridCacheUtils {
return false;
// Special handling for system cache is needed.
- if (isSystemCache(ccfg.getName())) {
+ if (isSystemCache(ccfg.getName()) || isIgfsCacheInSystemRegion(ccfg)) {
if (dsCfg.getDefaultDataRegionConfiguration().isPersistenceEnabled())
return true;
@@ -1829,6 +1830,15 @@ public class GridCacheUtils {
return false;
}
+ /**
+ * Checks whether cache configuration represents IGFS cache that will be placed in system memory region.
+ *
+ * @param ccfg Cache config.
+ */
+ private static boolean isIgfsCacheInSystemRegion(CacheConfiguration ccfg) {
+ return IgfsUtils.matchIgfsCacheName(ccfg.getName()) &&
+ (SYSTEM_DATA_REGION_NAME.equals(ccfg.getDataRegionName()) || ccfg.getDataRegionName() == null);
+ }
/**
* @return {@code true} if persistence is enabled for at least one data region, {@code false} if not.
http://git-wip-us.apache.org/repos/asf/ignite/blob/0121329f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
index a251234..9cf2f93 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
@@ -76,7 +76,7 @@ import static org.apache.ignite.configuration.DataStorageConfiguration.DFLT_PAGE
public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdapter
implements IgniteChangeGlobalStateSupport, CheckpointLockStateChecker {
/** DataRegionConfiguration name reserved for internal caches. */
- static final String SYSTEM_DATA_REGION_NAME = "sysMemPlc";
+ public static final String SYSTEM_DATA_REGION_NAME = "sysMemPlc";
/** Minimum size of memory chunk */
private static final long MIN_PAGE_MEMORY_SIZE = 10 * 1024 * 1024;