You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2018/05/29 12:25:15 UTC
ignite git commit: IGNITE-8604 Avoid starting cache templates on
client nodes. - Fixes #4072.
Repository: ignite
Updated Branches:
refs/heads/master 54f12e5bc -> b69ac8659
IGNITE-8604 Avoid starting cache templates on client nodes. - Fixes #4072.
Signed-off-by: Dmitriy Pavlov <dp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b69ac865
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b69ac865
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b69ac865
Branch: refs/heads/master
Commit: b69ac86594e6b7bb554ed8f75b23862a85d6efaa
Parents: 54f12e5
Author: Ilya Kasnacheev <il...@gmail.com>
Authored: Tue May 29 15:22:30 2018 +0300
Committer: Dmitriy Pavlov <dp...@apache.org>
Committed: Tue May 29 15:22:30 2018 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheProcessor.java | 10 ++++------
.../ignite/internal/processors/cache/GridCacheUtils.java | 8 ++++++++
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 3 ++-
3 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b69ac865/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 8cd6b88..29bba99 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
@@ -749,9 +749,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
cacheData.sql(sql);
- boolean template = cacheName.endsWith("*");
-
- if (!template) {
+ if (GridCacheUtils.isCacheTemplateName(cacheName))
+ templates.put(cacheName, new CacheInfo(cacheData, CacheType.USER, false, 0, true));
+ else {
if (caches.containsKey(cacheName)) {
throw new IgniteCheckedException("Duplicate cache name found (check configuration and " +
"assign unique name to each cache): " + cacheName);
@@ -764,8 +764,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
addStoredCache(caches, cacheData, cacheName, cacheType, true);
}
- else
- templates.put(cacheName, new CacheInfo(cacheData, CacheType.USER, false, 0, true));
}
/**
@@ -2798,7 +2796,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
if (cfg.getName() != null) {
- if (cfg.getName().endsWith("*")) {
+ if (GridCacheUtils.isCacheTemplateName(cfg.getName())) {
if (cfg.getName().length() > 1) {
if (wildcardNameCfgs == null)
wildcardNameCfgs = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/b69ac865/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..03f5eaf 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
@@ -1866,6 +1866,14 @@ public class GridCacheUtils {
}
/**
+ * @param cacheName Name of cache or cache template.
+ * @return {@code true} if cache name ends with asterisk (*), and therefire is a template name.
+ */
+ public static boolean isCacheTemplateName(String cacheName) {
+ return cacheName.endsWith("*");
+ }
+
+ /**
*
*/
public interface BackupPostProcessingClosure extends IgniteInClosure<Collection<GridCacheEntryInfo>>,
http://git-wip-us.apache.org/repos/asf/ignite/blob/b69ac865/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index ccd2b16..317fde2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -75,6 +75,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.GridCacheUtils;
import org.apache.ignite.internal.processors.cache.LocalJoinCachesContext;
import org.apache.ignite.internal.processors.cache.StateChangeRequest;
import org.apache.ignite.internal.processors.cache.WalStateAbstractMessage;
@@ -823,7 +824,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
List<CacheConfiguration> notStartedCacheConfigs = new ArrayList<>();
for (CacheConfiguration cCfg : cctx.gridConfig().getCacheConfiguration()) {
- if (!cacheNames.contains(cCfg.getName()))
+ if (!cacheNames.contains(cCfg.getName()) && !GridCacheUtils.isCacheTemplateName(cCfg.getName()))
notStartedCacheConfigs.add(cCfg);
}