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 2633C200C78 for ; Thu, 18 May 2017 09:33:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 24D10160BD1; Thu, 18 May 2017 07:33:50 +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 71231160BB0 for ; Thu, 18 May 2017 09:33:49 +0200 (CEST) Received: (qmail 89241 invoked by uid 500); 18 May 2017 07:33:48 -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 89221 invoked by uid 99); 18 May 2017 07:33:48 -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; Thu, 18 May 2017 07:33:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 59933DFF17; Thu, 18 May 2017 07:33:48 +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: Thu, 18 May 2017 07:33:48 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] ignite git commit: ignite-5075 archived-at: Thu, 18 May 2017 07:33:50 -0000 Repository: ignite Updated Branches: refs/heads/ignite-5075 f974c53b9 -> 103f68160 ignite-5075 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2724fcb3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2724fcb3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2724fcb3 Branch: refs/heads/ignite-5075 Commit: 2724fcb37d34b5ceab0da3a66ab985865f2a778a Parents: d20b76c Author: sboikov Authored: Thu May 18 01:54:30 2017 +0300 Committer: sboikov Committed: Thu May 18 01:54:30 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/CacheAffinitySharedManager.java | 5 +++-- modules/core/src/test/config/examples.properties | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2724fcb3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java index f53ff07..cec42a8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java @@ -462,7 +462,7 @@ public class CacheAffinitySharedManager extends GridCacheSharedManagerAdap cctx.cache().blockGateway(action.request()); - if (crd && desc.cacheConfiguration().getCacheMode() != LOCAL) { + if (crd && lateAffAssign && desc.cacheConfiguration().getCacheMode() != LOCAL) { CacheHolder cache = caches.remove(desc.cacheId()); assert cache != null : action.request(); @@ -1743,7 +1743,8 @@ public class CacheAffinitySharedManager extends GridCacheSharedManagerAdap assert ccfg != null : cacheDesc; assert ccfg.getCacheMode() != LOCAL : ccfg.getName(); - assert !cctx.discovery().cacheAffinityNodes(ccfg.getName(), fut.topologyVersion()).contains(cctx.localNode()); + assert !cctx.discovery().cacheAffinityNodes(ccfg.getName(), + fut.topologyVersion()).contains(cctx.localNode()) : cacheDesc.cacheName(); AffinityFunction affFunc = cctx.cache().clone(ccfg.getAffinity()); http://git-wip-us.apache.org/repos/asf/ignite/blob/2724fcb3/modules/core/src/test/config/examples.properties ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/examples.properties b/modules/core/src/test/config/examples.properties index c584f72..ea0d8ed 100644 --- a/modules/core/src/test/config/examples.properties +++ b/modules/core/src/test/config/examples.properties @@ -22,3 +22,4 @@ ScalarCacheExample=examples/config/example-ignite.xml ScalarCacheQueryExample=examples/config/example-ignite.xml ScalarCountGraphTrianglesExample=examples/config/example-ignite.xml ScalarPopularNumbersRealTimeExample=examples/config/example-ignite.xml +MemoryPolicyExample=examples/config/example-memory-policies.xml \ No newline at end of file