ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [02/36] incubator-ignite git commit: ignite-446
Date Thu, 23 Apr 2015 14:10:42 GMT
ignite-446


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fdad1e7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fdad1e7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fdad1e7f

Branch: refs/heads/ignite-656
Commit: fdad1e7f22f945c8e0d02ee5353285aaeed8dc59
Parents: e37888e
Author: Anton Vinogradov <avinogradov@gridgain.com>
Authored: Thu Apr 9 11:57:42 2015 +0300
Committer: Anton Vinogradov <avinogradov@gridgain.com>
Committed: Thu Apr 9 11:57:42 2015 +0300

----------------------------------------------------------------------
 .../src/main/java/org/apache/ignite/cluster/ClusterNode.java  | 1 +
 .../org/apache/ignite/configuration/CacheConfiguration.java   | 1 +
 .../dht/preloader/GridDhtPartitionsExchangeFuture.java        | 3 ++-
 .../processors/cache/IgniteTopologyValidatorCacheTest.java    | 7 ++++---
 4 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fdad1e7f/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
index 9cb5d3d..9de59a3 100644
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNode.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
 import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
+import java.io.Serializable;
 import java.util.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fdad1e7f/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 169b524..463904b 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -399,6 +399,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
         storeFactory = cc.getCacheStoreFactory();
         swapEnabled = cc.isSwapEnabled();
         tmLookupClsName = cc.getTransactionManagerLookupClassName();
+        topValidator = cc.getTopologyValidator();
         typeMeta = cc.getTypeMetadata();
         writeBehindBatchSize = cc.getWriteBehindBatchSize();
         writeBehindEnabled = cc.isWriteBehindEnabled();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fdad1e7f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index cc4843f..58eca2b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -792,7 +792,8 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
     /** {@inheritDoc} */
     @Override public boolean onDone(AffinityTopologyVersion res, Throwable err) {
         for (GridCacheContext cacheCtx : cctx.cacheContexts()) {
-            cacheValidRes.put(cacheCtx.name(), cacheCtx.config().getTopologyValidator().validate(discoEvt.topologyNodes()));
+            if (!CU.isSystemCache(cacheCtx.name()) && (cacheCtx.config().getTopologyValidator()
!= null))
+                cacheValidRes.put(cacheCtx.name(), cacheCtx.config().getTopologyValidator().validate(discoEvt.topologyNodes()));
         }
 
         cctx.cache().onExchangeDone(exchId.topologyVersion(), reqs, err);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fdad1e7f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorCacheTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorCacheTest.java
index ec29358..07d2d1d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTopologyValidatorCacheTest.java
@@ -21,15 +21,16 @@ import org.apache.ignite.cache.*;
 import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 
+import java.io.Serializable;
 import java.util.*;
 
 import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
 import static org.apache.ignite.cache.CacheAtomicityMode.*;
 
-public class IgniteTopologyValidatorCacheTest extends IgniteCacheAbstractTest {
+public class IgniteTopologyValidatorCacheTest extends IgniteCacheAbstractTest implements
Serializable {
     /** {@inheritDoc} */
     @Override protected int gridCount() {
-        return 2;
+        return 1;
     }
 
     /** {@inheritDoc} */
@@ -69,7 +70,7 @@ public class IgniteTopologyValidatorCacheTest extends IgniteCacheAbstractTest
{
 
     /** topology validator test */
     public void testTopologyValidator() throws Exception {
-
+        startGrid();
 
         jcache().getName();
     }


Mime
View raw message