You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/20 12:05:37 UTC
[2/2] incubator-ignite git commit: #ignite-1109: Fix comments after
review.
#ignite-1109: Fix comments after review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/51cf92dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/51cf92dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/51cf92dc
Branch: refs/heads/ignite-1109
Commit: 51cf92dcfbf412d7bb9a993bd2f8ffd7016b6cf3
Parents: d3646d2
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Jul 20 13:05:29 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Jul 20 13:05:29 2015 +0300
----------------------------------------------------------------------
.../ignite/configuration/CacheConfiguration.java | 1 -
.../processors/cache/GridCacheProcessor.java | 18 ++++++++++++++----
2 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51cf92dc/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 614113c..3ad0f01 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -20,7 +20,6 @@ package org.apache.ignite.configuration;
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cache.affinity.rendezvous.*;
import org.apache.ignite.cache.eviction.*;
import org.apache.ignite.cache.query.annotations.*;
import org.apache.ignite.cache.store.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/51cf92dc/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 a511e0e..dc071f3 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
@@ -2639,10 +2639,20 @@ public class GridCacheProcessor extends GridProcessorAdapter {
if (!((locHashIdResolver == null && rmtHashIdResolver == null) ||
(locHashIdResolver == null && rmtHashIdResolver.equals(defHashIdResolver)) ||
(rmtHashIdResolver == null && locHashIdResolver.equals(defHashIdResolver)))) {
- CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "cacheAffinity.hashIdResolver",
- "Partitioned cache affinity hash ID resolver class",
- locAttr.affinityHashIdResolverClassName(), rmtAttr.affinityHashIdResolverClassName(),
- true);
+
+ try {
+ CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "cacheAffinity.hashIdResolver",
+ "Partitioned cache affinity hash ID resolver class",
+ locHashIdResolver, rmtHashIdResolver, true);
+ }
+ catch (IgniteCheckedException e) {
+ if (locHashIdResolver == null && rmtHashIdResolver.equals(defHashIdResolver)) {
+ U.warn(log, "Set " + RendezvousAffinityFunction.class + " with " + defHashIdResolver +
+ " to CacheConfiguration to start node [cacheName=" + rmtAttr.cacheName() + "]");
+ }
+
+ throw e;
+ }
}
}
}