IGNITE-26754 Fix binary compatibility issue with dcId property (#12432)

Author: sergey-chugunov-1985

modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java

@@ -30,6 +30,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import org.apache.ignite.IgniteSystemProperties;
 import org.apache.ignite.cache.CacheMetrics;
 import org.apache.ignite.cluster.ClusterMetrics;
 import org.apache.ignite.cluster.ClusterNode;
@@ -590,7 +591,6 @@ public TcpDiscoveryNode clientReconnectNode(Map<String, Object> nodeAttrs) {
         out.writeLong(intOrder);
         out.writeObject(ver);
         U.writeUuid(out, clientRouterNodeId);
-        out.writeObject(dcId);
     }
 
     /** {@inheritDoc} */
@@ -628,7 +628,7 @@ public TcpDiscoveryNode clientReconnectNode(Map<String, Object> nodeAttrs) {
         else
             consistentId = consistentIdAttr != null ? consistentIdAttr : U.consistentId(addrs, discPort);
 
-        dcId = (String)in.readObject();
+        dcId = (String)attrs.get(IgniteSystemProperties.IGNITE_DATA_CENTER_ID);
     }
 
     /** {@inheritDoc} */

modules/core/src/test/java/org/apache/ignite/spi/discovery/datacenter/MultiDataCenterDeploymentTest.java

@@ -48,6 +48,14 @@ public class MultiDataCenterDeploymentTest extends GridCommonAbstractTest {
         return cfg;
     }
 
+    /** {@inheritDoc} */
+    @Override protected IgniteConfiguration optimize(IgniteConfiguration cfg) throws IgniteCheckedException {
+        // super.optimize() method sets includeProperties to a non-null value which later leads to
+        // IgniteSystemProperties not being added to node attributes.
+        // This test relies on the presence of IgniteSystemProperties in node attributes so we need set includeProperties to null.
+        return super.optimize(cfg).setIncludeProperties((String[])null);
+    }
+
     /** {@inheritDoc} */
     @Override protected void afterTest() throws Exception {
         super.afterTest();
@@ -68,8 +76,11 @@ public void testAttributeSetLocallyFromSystemProperty() throws Exception {
         String dcId = testGrid.localNode().dataCenterId();
 
         assertNotNull("Data Center ID of the node should not be null", dcId);
-
         assertEquals(DC_ID_0, dcId);
+
+        String dcIdFromSysProp = testGrid.localNode().attribute(IgniteSystemProperties.IGNITE_DATA_CENTER_ID);
+        assertNotNull("Data Center ID of the node should not be null", dcIdFromSysProp);
+        assertEquals(DC_ID_0, dcIdFromSysProp);
     }
 
     /**

modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClusterNode.java

@@ -27,6 +27,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
+import org.apache.ignite.IgniteSystemProperties;
 import org.apache.ignite.cache.CacheMetrics;
 import org.apache.ignite.cluster.ClusterMetrics;
 import org.apache.ignite.internal.ClusterMetricsSnapshot;
@@ -340,8 +341,6 @@ public void local(boolean loc) {
             mtr = ClusterMetricsSnapshot.serialize(metrics);
 
         U.writeByteArray(out, mtr);
-
-        out.writeObject(dcId);
     }
 
     /** {@inheritDoc} */
@@ -363,7 +362,7 @@ public void local(boolean loc) {
         if (mtr != null)
             metrics = ClusterMetricsSnapshot.deserialize(mtr, 0);
 
-        dcId = (String)in.readObject();
+        dcId = (String)attrs.get(IgniteSystemProperties.IGNITE_DATA_CENTER_ID);
     }
 
     /** {@inheritDoc} */