ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [06/50] incubator-ignite git commit: IGNITE-1026 - Dynamic cache start fix
Date Thu, 09 Jul 2015 14:55:32 GMT
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-1085
Commit: 08ea4ccf251afc9d485c5409c4b43539d01c62fb
Parents: 7cf9d76
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Fri Jun 19 15:30:38 2015 -0700
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
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());
-
     }
 
     /**


Mime
View raw message