ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [27/29] incubator-ignite git commit: # ignite-709_3
Date Mon, 18 May 2015 09:31:36 GMT
# ignite-709_3


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

Branch: refs/heads/ignite-709_2
Commit: dc315c0d22ade7a51936e97541896fa0b04760f2
Parents: c9d05d7
Author: sboikov <sboikov@gridgain.com>
Authored: Mon May 18 09:21:42 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon May 18 09:21:42 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/internal/MarshallerContextImpl.java    | 2 +-
 .../ignite/internal/processors/cache/GridCacheProcessor.java | 8 ++------
 .../dht/preloader/GridDhtPartitionsExchangeFuture.java       | 1 +
 .../internal/processors/service/GridServiceProcessor.java    | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc315c0d/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 13160b3..e614408 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -59,7 +59,7 @@ public class MarshallerContextImpl extends MarshallerContextAdapter {
         ctx.cache().marshallerCache().context().continuousQueries().executeInternalQuery(
             new ContinuousQueryListener(log, workDir),
             null,
-            !ctx.config().isClientMode(),
+            ctx.cache().marshallerCache().context().affinityNode(),
             true
         );
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc315c0d/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 923cbbd..fed9504 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
@@ -1879,9 +1879,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
 
                     // Check if we were asked to start a near cache.
                     if (nearCfg != null) {
-                        ClusterNode locNode = ctx.discovery().localNode();
-
-                        if (CU.affinityNode(locNode, descCfg.getNodeFilter())) {
+                        if (CU.affinityNode(ctx.discovery().localNode(), descCfg.getNodeFilter()))
{
                             // If we are on a data node and near cache was enabled, return
success, else - fail.
                             if (descCfg.getNearConfiguration() != null)
                                 return new GridFinishedFuture<>();
@@ -1928,9 +1926,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
                 return new GridFinishedFuture<>(new CacheExistsException("Failed to
start near cache " +
                     "(a cache with the given name is not started): " + cacheName));
 
-            ClusterNode locNode = ctx.discovery().localNode();
-
-            if (CU.affinityNode(locNode, ccfg.getNodeFilter())) {
+            if (CU.affinityNode(ctx.discovery().localNode(), ccfg.getNodeFilter())) {
                 if (ccfg.getNearConfiguration() != null)
                     return new GridFinishedFuture<>();
                 else

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc315c0d/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 828e472..599e391 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
@@ -365,6 +365,7 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
     }
 
     /**
+     * @param cacheCtx Cache context.
      * @return {@code True} if local node can calculate affinity on it's own for this partition
map exchange.
      */
     private boolean canCalculateAffinity(GridCacheContext cacheCtx) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc315c0d/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index d22c101..a9a15e9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -128,10 +128,10 @@ public class GridServiceProcessor extends GridProcessorAdapter {
                 ctx.cache().context().deploy().ignoreOwnership(true);
 
             cfgQryId = cache.context().continuousQueries().executeInternalQuery(
-                new DeploymentListener(), null, !ctx.config().isClientMode(), true);
+                new DeploymentListener(), null, cache.context().affinityNode(), true);
 
             assignQryId = cache.context().continuousQueries().executeInternalQuery(
-                new AssignmentListener(), null, !ctx.config().isClientMode(), true);
+                new AssignmentListener(), null, cache.context().affinityNode(), true);
         }
         finally {
             if (ctx.deploy().enabled())


Mime
View raw message