IGNITE-4501: Improvement of connection in a cluster of new node

modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java

@@ -544,6 +544,12 @@ public final class IgniteSystemProperties {
      */
     public static final String IGNITE_MEMORY_PER_BYTE_COPY_THRESHOLD = "IGNITE_MEMORY_PER_BYTE_COPY_THRESHOLD";
 
+    /**
+     * Cluster region ID used for sorting nodes in ring for discovery.
+     * <p>
+     * Defaults to {@code} Long.MIN_VALUE.
+     */
+    public static final String IGNITE_CLUSTER_REGION_ID = "IGNITE_CLUSTER_REGION_ID";
     /**
      * When set to {@code true} BinaryObject will be unwrapped before passing to IndexingSpi to preserve
      * old behavior query processor with IndexingSpi.

modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java

@@ -474,6 +474,9 @@ public class IgniteConfiguration {
     /** */
     private boolean lateAffAssignment = DFLT_LATE_AFF_ASSIGNMENT;
 
+    /** */
+    private long clusterRegionId = Long.MIN_VALUE;
+
     /**
      * Creates valid grid configuration with all default values.
      */
@@ -517,6 +520,7 @@ public IgniteConfiguration(IgniteConfiguration cfg) {
         clientMode = cfg.isClientMode();
         clockSyncFreq = cfg.getClockSyncFrequency();
         clockSyncSamples = cfg.getClockSyncSamples();
+        clusterRegionId = cfg.getClusterRegionId();
         connectorCfg = cfg.getConnectorConfiguration();
         consistentId = cfg.getConsistentId();
         daemon = cfg.isDaemon();
@@ -2686,6 +2690,27 @@ public IgniteConfiguration setLateAffinityAssignment(boolean lateAffAssignment)
         return this;
     }
 
+    /**
+     * Sets cluster region ID.
+     *
+     * @param clusterRegionId Cluster region ID.
+     * @return {@code this} for chaining.
+     */
+    public IgniteConfiguration setClusterRegionId(long clusterRegionId) {
+        this.clusterRegionId = clusterRegionId;
+
+        return this;
+    }
+
+    /**
+     * Gets cluster region ID.
+     *
+     * @return Cluster region ID.
+     */
+    public long getClusterRegionId(){
+        return clusterRegionId;
+    }
+
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(IgniteConfiguration.class, this);

modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java

@@ -697,7 +697,7 @@ else if (type == EVT_CLIENT_NODE_RECONNECTED) {
 
         checkAttributes(discoCache().remoteNodes());
 
-        ctx.service().initCompatibilityMode(discoCache().remoteNodes());
+        ctx.service().initCompatibilityMode();
 
         // Start discovery worker.
         new IgniteThread(discoWrk).start();

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java

@@ -813,7 +813,7 @@ private void refreshPartitions() {
      * @return {@code True} if message was sent, {@code false} if node left grid.
      */
     private boolean sendAllPartitions(Collection<ClusterNode> nodes) {
-        GridDhtPartitionsFullMessage m = createPartitionsFullMessage(nodes, null, null, true);
+        GridDhtPartitionsFullMessage m = createPartitionsFullMessage(null, null, true);
 
         if (log.isDebugEnabled())
             log.debug("Sending all partitions [nodeIds=" + U.nodeIds(nodes) + ", msg=" + m + ']');
@@ -838,13 +838,12 @@ private boolean sendAllPartitions(Collection<ClusterNode> nodes) {
     }
 
     /**
-     * @param nodes Target nodes.
      * @param exchId Non-null exchange ID if message is created for exchange.
      * @param lastVer Last version.
      * @param compress {@code True} if it is possible to use compression for message.
      * @return Message.
      */
-    public GridDhtPartitionsFullMessage createPartitionsFullMessage(Collection<ClusterNode> nodes,
+    public GridDhtPartitionsFullMessage createPartitionsFullMessage(
         @Nullable GridDhtPartitionExchangeId exchId,
         @Nullable GridCacheVersion lastVer,
         boolean compress) {

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java

@@ -75,6 +75,7 @@
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteInClosure;
 import org.apache.ignite.lang.IgniteRunnable;
+import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
 import org.jetbrains.annotations.Nullable;
 import org.jsr166.ConcurrentHashMap8;
 
@@ -990,15 +991,13 @@ private void sendLocalPartitions(ClusterNode node)
     }
 
     /**
-     * @param nodes Target nodes.
      * @param compress {@code True} if it is possible to use compression for message.
      * @return Message.
      */
-    private GridDhtPartitionsFullMessage createPartitionsMessage(Collection<ClusterNode> nodes, boolean compress) {
+    private GridDhtPartitionsFullMessage createPartitionsMessage(boolean compress) {
         GridCacheVersion last = lastVer.get();
 
-        return cctx.exchange().createPartitionsFullMessage(nodes,
-            exchangeId(),
+        return cctx.exchange().createPartitionsFullMessage(exchangeId(),
             last != null ? last : cctx.versions().last(),
             compress);
     }
@@ -1008,7 +1007,7 @@ private GridDhtPartitionsFullMessage createPartitionsMessage(Collection<ClusterN
      * @throws IgniteCheckedException If failed.
      */
     private void sendAllPartitions(Collection<ClusterNode> nodes) throws IgniteCheckedException {
-        GridDhtPartitionsFullMessage m = createPartitionsMessage(nodes, true);
+        GridDhtPartitionsFullMessage m = createPartitionsMessage(true);
 
         assert !nodes.contains(cctx.localNode());
 
@@ -1264,7 +1263,7 @@ private void onAffinityInitialized(IgniteInternalFuture<Map<Integer, Map<Integer
 
             Map<Integer, Map<Integer, List<UUID>>> assignmentChange = fut.get();
 
-            GridDhtPartitionsFullMessage m = createPartitionsMessage(null, false);
+            GridDhtPartitionsFullMessage m = createPartitionsMessage(false);
 
             CacheAffinityChangeMessage msg = new CacheAffinityChangeMessage(exchId, m, assignmentChange);
 

modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java

@@ -1265,10 +1265,8 @@ private Iterator<Cache.Entry<Object, Object>> serviceEntries(IgniteBiPredicate<O
         }
     }
 
-    /**
-     * @param nodes Remote nodes.
-     */
-    public void initCompatibilityMode(Collection<ClusterNode> nodes) {
+    /** */
+    public void initCompatibilityMode() {
         boolean mode = false;
 
         if (srvcCompatibilitySysProp != null)