Repository: ignite Updated Branches: refs/heads/ignite-5075 7a6c27e49 -> 7c137ac05
ignite-5075 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7c137ac0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7c137ac0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7c137ac0 Branch: refs/heads/ignite-5075 Commit: 7c137ac0578f8068b355e415a3eafcc7f16f81b6 Parents: 7a6c27e Author: sboikov <[email protected]> Authored: Fri May 19 13:23:50 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri May 19 13:23:50 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/ClusterCachesInfo.java | 25 +++++++++++--------- 1 file changed, 14 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7c137ac0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java index eb8aa91..708b8f6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java @@ -1060,22 +1060,23 @@ class ClusterCachesInfo { CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg, "cacheMode", "Cache mode", cfg.getCacheMode(), startCfg.getCacheMode(), true); - CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg, "rebalanceMode", "Rebalance mode", - cfg.getRebalanceMode(), startCfg.getRebalanceMode(), true); - CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg, "affinity", "Affinity function", attr1.cacheAffinityClassName(), attr2.cacheAffinityClassName(), true); CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg, "nodeFilter", "Node filter", attr1.nodeFilterClassName(), attr2.nodeFilterClassName(), true); - if (cfg.getCacheMode() == PARTITIONED) { - CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg, "backups", "Backups", - cfg.getBackups(), startCfg.getBackups(), true); - } - CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg, "memoryPolicyName", "Memory policy", - cfg.getCacheMode(), startCfg.getCacheMode(), true); + cfg.getMemoryPolicyName(), startCfg.getMemoryPolicyName(), true); + + CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg, "topologyValidator", "Topology validator", + attr1.topologyValidatorClassName(), attr2.topologyValidatorClassName(), true); + + CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg, "partitionLossPolicy", "Partition Loss Policy", + cfg.getPartitionLossPolicy(), startCfg.getPartitionLossPolicy(), true); + + CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg, "rebalanceMode", "Rebalance mode", + cfg.getRebalanceMode(), startCfg.getRebalanceMode(), true); CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg, "rebalanceDelay", "Rebalance delay", cfg.getRebalanceDelay(), startCfg.getRebalanceDelay(), false); @@ -1083,8 +1084,10 @@ class ClusterCachesInfo { CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg, "rebalanceOrder", "Rebalance order", cfg.getRebalanceOrder(), startCfg.getRebalanceOrder(), false); - CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg, "partitionLossPolicy", "Partition Loss Policy", - cfg.getPartitionLossPolicy(), startCfg.getPartitionLossPolicy(), true); + if (cfg.getCacheMode() == PARTITIONED) { + CU.validateCacheGroupsAttributesMismatch(log, cfg, startCfg, "backups", "Backups", + cfg.getBackups(), startCfg.getBackups(), true); + } } /**
