ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject ignite git commit: IGNITE-6102 - Do not run consistency check for client and daemon nodes
Date Fri, 18 Aug 2017 07:22:06 GMT
Repository: ignite
Updated Branches:
  refs/heads/master bb326d19c -> fc94085da


IGNITE-6102 - Do not run consistency check for client and daemon nodes


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

Branch: refs/heads/master
Commit: fc94085da46b01352cbfba0eb8615d29abe35261
Parents: bb326d1
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Authored: Fri Aug 18 10:21:24 2017 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Fri Aug 18 10:21:50 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheProcessor.java    | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/fc94085d/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 306c595..c4e8559 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
@@ -3041,6 +3041,11 @@ public class GridCacheProcessor extends GridProcessorAdapter {
      * @throws IgniteCheckedException If check failed.
      */
     private void checkMemoryConfiguration(ClusterNode rmt) throws IgniteCheckedException
{
+        ClusterNode locNode = ctx.discovery().localNode();
+
+        if (locNode.isClient() || locNode.isDaemon() || rmt.isClient() || rmt.isDaemon())
+            return;
+
         MemoryConfiguration memCfg = rmt.attribute(IgniteNodeAttributes.ATTR_MEMORY_CONFIG);
 
         if (memCfg != null) {


Mime
View raw message