Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DA7A4200CB4 for ; Mon, 22 May 2017 18:44:54 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D9368160BAD; Mon, 22 May 2017 16:44:54 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 14F3A160BD4 for ; Mon, 22 May 2017 18:44:53 +0200 (CEST) Received: (qmail 64100 invoked by uid 500); 22 May 2017 16:44:53 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 64012 invoked by uid 99); 22 May 2017 16:44:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 May 2017 16:44:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ED550E1863; Mon, 22 May 2017 16:44:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Mon, 22 May 2017 16:44:53 -0000 Message-Id: In-Reply-To: <9340ca0e19fb4a8290fa6c39dd850ddc@git.apache.org> References: <9340ca0e19fb4a8290fa6c39dd850ddc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/8] ignite git commit: ignite-5075 archived-at: Mon, 22 May 2017 16:44:55 -0000 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-pds Commit: 7c137ac0578f8068b355e415a3eafcc7f16f81b6 Parents: 7a6c27e Author: sboikov Authored: Fri May 19 13:23:50 2017 +0300 Committer: sboikov 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); + } } /**