IGNITE-26580 Test WIP

Author: sergey-chugunov-1985

…y/rendezvous/DcAffinityBackupFilter.java …/rendezvous/MdcAffinityBackupFilter.javamodules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/DcAffinityBackupFilter.java renamed to modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/MdcAffinityBackupFilter.java modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/DcAffinityBackupFilter.java renamed to modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/MdcAffinityBackupFilter.java

@@ -17,15 +17,15 @@
 
 package org.apache.ignite.cache.affinity.rendezvous;
 
-import java.util.LinkedHashMap;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.lang.IgniteBiPredicate;
 
 /** */
-public class DcAffinityBackupFilter implements IgniteBiPredicate<ClusterNode, List<ClusterNode>> {
+public class MdcAffinityBackupFilter implements IgniteBiPredicate<ClusterNode, List<ClusterNode>> {
     /** */
     private static final long serialVersionUID = 1L;
 
@@ -42,16 +42,16 @@ public class DcAffinityBackupFilter implements IgniteBiPredicate<ClusterNode, Li
      * @param dcsCount
      * @param backups
      */
-    public DcAffinityBackupFilter(int dcsCount, int backups) {
+    public MdcAffinityBackupFilter(int dcsCount, int backups) {
         this.dcsCount = dcsCount;
-        partsDistrMap = new LinkedHashMap<>(4);
+        partsDistrMap = new HashMap<>(dcsCount + 1);
         primaryAndBackups = backups + 1;
     }
 
     /** {@inheritDoc} */
     @Override public boolean apply(ClusterNode node, List<ClusterNode> list) {
-        if (list.size() == 1)
-            partsDistrMap.put(list.get(0).dataCenterId(), 1); //account for primary node which is assigned beforehand
+        if (list.size() == 1) //account for primary node which is assigned beforehand
+            partsDistrMap.put(list.get(0).dataCenterId(), 1);
 
         String candidateDcId = node.dataCenterId();
         Integer candDcPartsCopies = partsDistrMap.get(candidateDcId);

…vous/DcAffinityBackupFilterSelfTest.java …ous/MdcAffinityBackupFilterSelfTest.javamodules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/DcAffinityBackupFilterSelfTest.java renamed to modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/MdcAffinityBackupFilterSelfTest.java modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/DcAffinityBackupFilterSelfTest.java renamed to modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/MdcAffinityBackupFilterSelfTest.java

@@ -17,41 +17,64 @@
 
 package org.apache.ignite.cache.affinity.rendezvous;
 
+import java.util.Collection;
+import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.cache.affinity.Affinity;
+import org.apache.ignite.cache.affinity.AffinityFunction;
+import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
 
 /** */
-public class DcAffinityBackupFilterSelfTest extends GridCommonAbstractTest {
+public class MdcAffinityBackupFilterSelfTest extends GridCommonAbstractTest {
     /** */
     private static final String DC_0_ID = "DC_0";
 
     /** */
     private static final String DC_1_ID = "DC_1";
 
+    /** {@inheritDoc} */
     @Override protected IgniteConfiguration optimize(IgniteConfiguration cfg) throws IgniteCheckedException {
         return super.optimize(cfg).setIncludeProperties((String[])null);
     }
 
+    /**
+     * Verifies that partition copies are assigned evenly to all data centers.
+     *
+     * @throws Exception If failed.
+     */
     @Test
-    public void test1() throws Exception {
+    public void testBasicDistribution() throws Exception {
         System.setProperty(IgniteSystemProperties.IGNITE_DATA_CENTER_ID, DC_0_ID);
-        startGrids(3);
+        startGrids(2);
 
         System.setProperty(IgniteSystemProperties.IGNITE_DATA_CENTER_ID, DC_1_ID);
-        startGrid(3);
-        startGrid(4);
-        IgniteEx srv = startGrid(5);
+        startGrid(2);
+        IgniteEx srv = startGrid(3);
 
-        CacheConfiguration ccfg = defaultCacheConfiguration();
-        ccfg.setBackups(3);
-        ccfg.setAffinity(new RendezvousAffinityFunction(false, 2)
-            .setAffinityBackupFilter(new DcAffinityBackupFilter(2, 3)));
+        CacheConfiguration ccfg = defaultCacheConfiguration()
+            .setBackups(3)
+            .setAffinity(
+                new RendezvousAffinityFunction(false, 4)
+                    .setAffinityBackupFilter(new MdcAffinityBackupFilter(2, 3)));
 
-        srv.getOrCreateCache(ccfg);
+        IgniteCache cache = srv.getOrCreateCache(ccfg);
+
+        checkPartitions(srv, cache, 3);
+    }
+
+    /** */
+    private void checkPartitions(IgniteEx srv, IgniteCache cache, int backups) throws IgniteCheckedException {) {
+        int partCnt = cacheConfiguration(srv.configuration(), cache.getName()).getAffinity().partitions();
+        Affinity aff = affinity(cache);
+
+        for (int i = 0; i < partCnt; i++) {
+            Collection<ClusterNode> nodes = aff.mapKeyToPrimaryAndBackups(i);
+        }
     }
 }