You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/05/29 14:32:23 UTC

[14/22] ignite git commit: Start internal caches first

Start internal caches first


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

Branch: refs/heads/ignite-5075
Commit: e0b2053e663c76a17b262940cef33399d30ec824
Parents: 172419b
Author: Константин Дудков <kd...@ya.ru>
Authored: Mon May 29 11:03:39 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon May 29 11:03:39 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/ClusterCachesInfo.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e0b2053e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
index ab5cf37..c372037 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
@@ -717,8 +717,13 @@ class ClusterCachesInfo {
                     desc = desc0;
                 }
 
-                if (locCfg != null || joinDiscoData.startCaches() || CU.affinityNode(ctx.discovery().localNode(), cfg.getNodeFilter()))
-                    locJoinStartCaches.add(new T2<>(desc, nearCfg));
+                if (locCfg != null || joinDiscoData.startCaches() || CU.affinityNode(ctx.discovery().localNode(), cfg.getNodeFilter())) {
+                    // Move system and internal caches first.
+                    if (desc.cacheType().userCache())
+                        locJoinStartCaches.add(new T2<>(desc, nearCfg));
+                    else
+                        locJoinStartCaches.add(0, new T2<>(desc, nearCfg));
+                }
             }
         }
     }