Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DA7EC1817F for ; Thu, 9 Jul 2015 09:14:11 +0000 (UTC) Received: (qmail 39783 invoked by uid 500); 9 Jul 2015 09:14:11 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 39753 invoked by uid 500); 9 Jul 2015 09:14:11 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 39744 invoked by uid 99); 9 Jul 2015 09:14:11 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Jul 2015 09:14:11 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 3961FD33B1 for ; Thu, 9 Jul 2015 09:14:06 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.452 X-Spam-Level: * X-Spam-Status: No, score=1.452 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.329, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id ZGEJoieXWSH3 for ; Thu, 9 Jul 2015 09:13:58 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 120624C0D1 for ; Thu, 9 Jul 2015 09:13:54 +0000 (UTC) Received: (qmail 38015 invoked by uid 99); 9 Jul 2015 09:13:54 -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, 09 Jul 2015 09:13:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5AD51E680D; Thu, 9 Jul 2015 09:13:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 09 Jul 2015 09:14:01 -0000 Message-Id: In-Reply-To: <658b60d8afc947e2aa2848b377d23b40@git.apache.org> References: <658b60d8afc947e2aa2848b377d23b40@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/26] incubator-ignite git commit: IGNITE-1026 - Dynamic cache start fix IGNITE-1026 - Dynamic cache start fix Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/08ea4ccf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/08ea4ccf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/08ea4ccf Branch: refs/heads/ignite-gg-10509 Commit: 08ea4ccf251afc9d485c5409c4b43539d01c62fb Parents: 7cf9d76 Author: Valentin Kulichenko Authored: Fri Jun 19 15:30:38 2015 -0700 Committer: Valentin Kulichenko Committed: Fri Jun 19 15:30:38 2015 -0700 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheProcessor.java | 9 --------- .../store/CacheStoreSessionListenerAbstractSelfTest.java | 1 - 2 files changed, 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08ea4ccf/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 4f1a3e6..0f9247f 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 @@ -1957,17 +1957,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { return new GridFinishedFuture<>(); } - if (CU.affinityNode(ctx.discovery().localNode(), ccfg.getNodeFilter())) { - if (ccfg.getNearConfiguration() != null) - return new GridFinishedFuture<>(); - else - return new GridFinishedFuture<>(new IgniteCheckedException("Failed to start client cache " + - "(local node is an affinity node for cache): " + cacheName)); - } - req.deploymentId(desc.deploymentId()); req.startCacheConfiguration(ccfg); - } if (nearCfg != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/08ea4ccf/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java index adac0b2..0634197 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java @@ -145,7 +145,6 @@ public abstract class CacheStoreSessionListenerAbstractSelfTest extends GridComm assertEquals(1, writeCnt.get()); assertEquals(1, deleteCnt.get()); assertEquals(0, reuseCnt.get()); - } /**