IGNITE-26580 Address review comments

Author: sergey-chugunov-1985

modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/MdcAffinityBackupFilter.java

@@ -130,6 +130,24 @@ public MdcAffinityBackupFilter(int dcsNum, int backups) {
         return candDcCopiesAssigned < partCopiesPerDc;
     }
 
+    /** {@inheritDoc} */
+    @Override public boolean equals(Object o) {
+        if (this == o)
+            return true;
+
+        if (!(o instanceof MdcAffinityBackupFilter))
+            return false;
+
+        MdcAffinityBackupFilter filter = (MdcAffinityBackupFilter)o;
+
+        return partCopiesPerDc == filter.partCopiesPerDc;
+    }
+
+    /** {@inheritDoc} */
+    @Override public int hashCode() {
+        return super.hashCode();
+    }
+
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(MdcAffinityBackupFilter.class, this);

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

@@ -431,6 +431,12 @@ private void checkCache(CacheJoinNodeDiscoveryData.CacheInfo locInfo, CacheData
             "Affinity partitions count", locAttr.affinityPartitionsCount(),
             rmtAttr.affinityPartitionsCount(), true);
 
+        CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "affinityBackupFilterClass", "Affinity backup filter class",
+            locAttr.affinityBackupFilterClass(), rmtAttr.affinityBackupFilterClass(), true);
+
+        CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "affinityBackupFilter", "Affinity backup filter",
+            locAttr.affinityBackupFilter(), rmtAttr.affinityBackupFilter(), true);
+
         CU.validateKeyConfigiration(rmtAttr.groupName(), rmtAttr.cacheName(), rmt, rmtAttr.configuration().getKeyConfiguration(),
             locAttr.configuration().getKeyConfiguration(), log, true);
 

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

@@ -29,7 +29,9 @@
 import org.apache.ignite.configuration.NearCacheConfiguration;
 import org.apache.ignite.configuration.TransactionConfiguration;
 import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.lang.IgniteBiPredicate;
 import org.jetbrains.annotations.Nullable;
+
 import static org.apache.ignite.configuration.CacheConfiguration.DFLT_CACHE_ATOMICITY_MODE;
 import static org.apache.ignite.configuration.CacheConfiguration.DFLT_CACHE_MODE;
 
@@ -152,6 +154,24 @@ public boolean affinityIncludeNeighbors() {
             && !((RendezvousAffinityFunction)aff).isExcludeNeighbors();
     }
 
+    /**
+     * @return Affinity backup filter class name.
+     */
+    public @Nullable String affinityBackupFilterClass() {
+        AffinityFunction aff = ccfg.getAffinity();
+
+        return aff instanceof RendezvousAffinityFunction ? className(((RendezvousAffinityFunction)aff).getAffinityBackupFilter()) : null;
+    }
+
+    /**
+     * @return Affinity backup filter.
+     */
+    public @Nullable IgniteBiPredicate<?, ?> affinityBackupFilter() {
+        AffinityFunction aff = ccfg.getAffinity();
+
+        return (aff instanceof RendezvousAffinityFunction) ? ((RendezvousAffinityFunction)aff).getAffinityBackupFilter() : null;
+    }
+
     /**
      * @return Affinity key backups.
      */

modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/MdcAffinityBackupFilterSelfTest.java

@@ -23,11 +23,13 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 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.cluster.ClusterNode;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.lang.IgniteBiPredicate;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.junit.Test;
 
@@ -37,14 +39,17 @@
  */
 public class MdcAffinityBackupFilterSelfTest extends GridCommonAbstractTest {
     /** */
-    private static final int PARTS_CNT = 8;
+    private static final int PARTS_CNT = 1024;
 
     /** */
     private int backups;
 
     /** */
     private String[] dcIds;
 
+    /** */
+    private IgniteBiPredicate<ClusterNode, List<ClusterNode>> filter;
+
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
         IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
@@ -53,7 +58,7 @@ public class MdcAffinityBackupFilterSelfTest extends GridCommonAbstractTest {
             .setBackups(backups)
             .setAffinity(
                 new RendezvousAffinityFunction(false, PARTS_CNT)
-                    .setAffinityBackupFilter(new MdcAffinityBackupFilter(dcIds.length, backups))));
+                    .setAffinityBackupFilter(filter)));
 
         return cfg;
     }
@@ -70,26 +75,28 @@ public class MdcAffinityBackupFilterSelfTest extends GridCommonAbstractTest {
      */
     @Test
     public void testSingleDcDeploymentIsProhibited() {
-        dcIds = new String[] {"DC_0"};
-        System.setProperty(IgniteSystemProperties.IGNITE_DATA_CENTER_ID, dcIds[0]);
-
-        backups = 1;
-        verifyGridFailsToStartWithMessage("Number of datacenters must be at least 2.");
+        verifyMdcAffinityBackupFilterValidation(1, 1, "Number of datacenters must be at least 2.");
     }
 
     /**
      * Verifies that {@link MdcAffinityBackupFilter} enforces even number of partition copies per datacenter.
      */
     @Test
-    public void testEvenNumberOfPartitionCopiesPerDcIsEnforced() {
-        dcIds = new String[] {"DC_0", "DC_1", "DC_2"};
-        System.setProperty(IgniteSystemProperties.IGNITE_DATA_CENTER_ID, dcIds[0]);
+    public void testUniformNumberOfPartitionCopiesPerDcIsEnforced() {
+        verifyMdcAffinityBackupFilterValidation(3, 1, "recommended value is 2");
 
-        backups = 1;
-        verifyGridFailsToStartWithMessage("recommended value is 2");
+        verifyMdcAffinityBackupFilterValidation(3, 7, "recommended values are 5 and 8");
+    }
+
+    /** */
+    private void verifyMdcAffinityBackupFilterValidation(int dcsNum, int backups, String msg) {
+        try {
+            new MdcAffinityBackupFilter(dcsNum, backups);
+        } catch (IllegalArgumentException argEx) {
+            String errMsg = argEx.getMessage();
 
-        backups = 7;
-        verifyGridFailsToStartWithMessage("recommended values are 5 and 8");
+            assertTrue(errMsg.contains(msg));
+        }
     }
 
     /**
@@ -104,6 +111,7 @@ public void test2DcDistribution() throws Exception {
         dcIds = new String[] {"DC_0", "DC_1"};
         int nodesPerDc = 4;
         backups = 3;
+        filter = new MdcAffinityBackupFilter(dcIds.length, backups);
 
         IgniteEx srv = startClusterAcrossDataCenters(dcIds, nodesPerDc);
 
@@ -134,22 +142,50 @@ public void test3DcDistribution() throws Exception {
         dcIds = new String[] {"DC_0", "DC_1", "DC_2"};
         int nodesPerDc = 2;
         backups = 5;
+        filter = new MdcAffinityBackupFilter(dcIds.length, backups);
 
         IgniteEx srv = startClusterAcrossDataCenters(dcIds, 2);
 
         verifyDistributionProperties(srv, dcIds, nodesPerDc, backups);
     }
 
-    /** */
-    private void verifyGridFailsToStartWithMessage(String msg) {
+    /**
+     * Verifies that node is prohibited from joining cluster if its affinityBackupFilter configuration differs
+     * from the one specified in the cluster.
+     *
+     * @throws Exception If failed.
+     */
+    @Test
+    public void testAffinityFilterConfigurationValidation() throws Exception {
+        dcIds = new String[] {"DC_0", "DC_1"};
+        backups = 3;
+        filter = new MdcAffinityBackupFilter(dcIds.length, backups);
+        startGrid(0);
+
+        filter = new ClusterNodeAttributeAffinityBackupFilter("DC_ID");
         try {
-            startGrid(0);
-        } catch (IllegalArgumentException argEx) {
-            String errMsg = argEx.getMessage();
+            startGrid(1);
 
-            assertTrue(errMsg.contains(msg));
-        } catch (Exception e) {
-            fail("Unexpected exception was thrown: " + e);
+            fail("Expected exception was not thrown.");
+        } catch (IgniteCheckedException e) {
+            String errMsg = e.getMessage();
+
+            assertNotNull(errMsg);
+
+            assertTrue(errMsg.contains("Affinity backup filter class mismatch"));
+        }
+
+        filter = new MdcAffinityBackupFilter(dcIds.length, backups + dcIds.length);
+        try {
+            startGrid(1);
+
+            fail("Expected exception was not thrown.");
+        } catch (IgniteCheckedException e) {
+            String errMsg = e.getMessage();
+
+            assertNotNull(errMsg);
+
+            assertTrue(errMsg.contains("Affinity backup filter mismatch"));
         }
     }