From 6b77d975ab2ae33bc2b3f28107eb891896115054 Mon Sep 17 00:00:00 2001 From: Aleksandr Polovtsev Date: Sun, 5 Jan 2025 11:56:06 +0200 Subject: [PATCH] IGNITE-24014 Rename some configuration properties * NodeAttributeConfigurationSchema: attribute -> value * SystemPropertyConfigurationSchema: propertyValue -> value. --- examples/config/ignite-config.conf | 4 ++-- .../topology/ItLogicalTopologyTest.java | 2 +- .../NodeAttributeConfigurationSchema.java | 2 ++ .../SystemPropertyConfigurationSchema.java | 2 ++ ...ibutedConfigurationPropertyHolderTest.java | 3 +-- .../ItDistributionZonesFiltersTest.java | 20 +++++++++---------- .../BaseDistributionZoneManagerTest.java | 2 +- .../distribution-zones/tech-notes/filters.md | 11 ++++------ .../metastorage/TestMetasStorageUtils.java | 4 ++-- ...ageCompactionTriggerConfigurationTest.java | 4 ++-- .../replicator/ItReplicaLifecycleTest.java | 6 +++--- .../runner/app/ItIgniteNodeRestartTest.java | 4 ++-- .../runner/app/ItReplicaStateManagerTest.java | 6 +++--- .../sql/engine/ItUnstableTopologyTest.java | 2 +- ...ePartitionsRecoveryByFilterUpdateTest.java | 6 +++--- 15 files changed, 39 insertions(+), 39 deletions(-) diff --git a/examples/config/ignite-config.conf b/examples/config/ignite-config.conf index adc047156abb..08e86dccac99 100644 --- a/examples/config/ignite-config.conf +++ b/examples/config/ignite-config.conf @@ -24,7 +24,7 @@ ignite { ] } nodeAttributes.nodeAttributes { - region.attribute = US - storage.attribute = SSD + region.value = US + storage.value = SSD } } diff --git a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/topology/ItLogicalTopologyTest.java b/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/topology/ItLogicalTopologyTest.java index 3a7593d302dc..1dc22681812c 100644 --- a/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/topology/ItLogicalTopologyTest.java +++ b/modules/cluster-management/src/integrationTest/java/org/apache/ignite/internal/cluster/management/topology/ItLogicalTopologyTest.java @@ -67,7 +67,7 @@ class ItLogicalTopologyTest extends ClusterPerTestIntegrationTest { + " port: {},\n" + " nodeFinder.netClusterNodes: [ {} ]\n" + " },\n" - + " nodeAttributes.nodeAttributes: {region.attribute = US, storage.attribute = SSD},\n" + + " nodeAttributes.nodeAttributes: {region.value = US, storage.value = SSD},\n" + " storage.profiles: {lru_rocks.engine = rocksdb, segmented_aipersist.engine = aipersist},\n" + " clientConnector.port: {},\n" + " rest.port: {},\n" diff --git a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/configuration/NodeAttributeConfigurationSchema.java b/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/configuration/NodeAttributeConfigurationSchema.java index cb52ebf3a2ec..1c5f0423403f 100644 --- a/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/configuration/NodeAttributeConfigurationSchema.java +++ b/modules/cluster-management/src/main/java/org/apache/ignite/internal/cluster/management/configuration/NodeAttributeConfigurationSchema.java @@ -19,6 +19,7 @@ import org.apache.ignite.configuration.annotation.Config; import org.apache.ignite.configuration.annotation.InjectedName; +import org.apache.ignite.configuration.annotation.PublicName; import org.apache.ignite.configuration.annotation.Value; /** @@ -36,5 +37,6 @@ public class NodeAttributeConfigurationSchema { /** Node attribute field. */ @Value(hasDefault = true) + @PublicName("value") public String attribute = ""; } diff --git a/modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemPropertyConfigurationSchema.java b/modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemPropertyConfigurationSchema.java index acbe11a4e2b8..362c4bbd261a 100644 --- a/modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemPropertyConfigurationSchema.java +++ b/modules/configuration-system/src/main/java/org/apache/ignite/internal/configuration/SystemPropertyConfigurationSchema.java @@ -20,6 +20,7 @@ import org.apache.ignite.configuration.ConfigurationModule; import org.apache.ignite.configuration.annotation.Config; import org.apache.ignite.configuration.annotation.InjectedName; +import org.apache.ignite.configuration.annotation.PublicName; import org.apache.ignite.configuration.annotation.Value; import org.apache.ignite.configuration.validation.CamelCaseKeys; import org.apache.ignite.internal.configuration.validation.LongNumberSystemPropertyValueValidator; @@ -42,5 +43,6 @@ public class SystemPropertyConfigurationSchema { public String name; @Value + @PublicName("value") public String propertyValue; } diff --git a/modules/configuration-system/src/test/java/org/apache/ignite/internal/configuration/utils/SystemDistributedConfigurationPropertyHolderTest.java b/modules/configuration-system/src/test/java/org/apache/ignite/internal/configuration/utils/SystemDistributedConfigurationPropertyHolderTest.java index b9a9b600a05f..ba12ea0431d9 100644 --- a/modules/configuration-system/src/test/java/org/apache/ignite/internal/configuration/utils/SystemDistributedConfigurationPropertyHolderTest.java +++ b/modules/configuration-system/src/test/java/org/apache/ignite/internal/configuration/utils/SystemDistributedConfigurationPropertyHolderTest.java @@ -60,8 +60,7 @@ void testEmptySystemProperties(@InjectConfiguration SystemDistributedConfigurati @Test void testValidSystemPropertiesOnStart( - @InjectConfiguration("mock.properties = {" - + PROPERTY_NAME + ".propertyValue = \"newValue\"}") + @InjectConfiguration("mock.properties = {" + PROPERTY_NAME + ".value = \"newValue\"}") SystemDistributedConfiguration systemConfig ) { var config = noopConfigHolder(systemConfig); diff --git a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/distributionzones/ItDistributionZonesFiltersTest.java b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/distributionzones/ItDistributionZonesFiltersTest.java index 8bfd18470fa0..37e9b71c476c 100644 --- a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/distributionzones/ItDistributionZonesFiltersTest.java +++ b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/distributionzones/ItDistributionZonesFiltersTest.java @@ -63,7 +63,7 @@ public class ItDistributionZonesFiltersTest extends ClusterPerTestIntegrationTes private static final String TABLE_NAME = "table1"; @Language("HOCON") - private static final String NODE_ATTRIBUTES = "{region.attribute = US, storage.attribute = SSD}"; + private static final String NODE_ATTRIBUTES = "{region.value = US, storage.value = SSD}"; private static final String STORAGE_PROFILES = String.format("'%s, %s'", DEFAULT_ROCKSDB_PROFILE_NAME, DEFAULT_AIPERSIST_PROFILE_NAME); @@ -115,7 +115,7 @@ void testFilteredDataNodesPropagatedToStable() throws Exception { String filter = "$[?(@.region == \"US\" && @.storage == \"SSD\")]"; // This node do not pass the filter - @Language("HOCON") String firstNodeAttributes = "{region:{attribute:\"EU\"},storage:{attribute:\"SSD\"}}"; + @Language("HOCON") String firstNodeAttributes = "{region.value: EU, storage.value: SSD}"; Ignite node = startNode(1, createStartConfig(firstNodeAttributes, STORAGE_PROFILES_CONFIGS)); @@ -123,10 +123,10 @@ void testFilteredDataNodesPropagatedToStable() throws Exception { node.sql().execute(null, createTableSql()); - MetaStorageManager metaStorageManager = (MetaStorageManager) IgniteTestUtils + MetaStorageManager metaStorageManager = IgniteTestUtils .getFieldValue(node, IgniteImpl.class, "metaStorageMgr"); - TableManager tableManager = (TableManager) IgniteTestUtils.getFieldValue(node, IgniteImpl.class, "distributedTblMgr"); + TableManager tableManager = IgniteTestUtils.getFieldValue(node, IgniteImpl.class, "distributedTblMgr"); TableViewInternal table = (TableViewInternal) tableManager.table(TABLE_NAME); @@ -140,7 +140,7 @@ void testFilteredDataNodesPropagatedToStable() throws Exception { TIMEOUT_MILLIS ); - @Language("HOCON") String secondNodeAttributes = "{region:{attribute:\"US\"},storage:{attribute:\"SSD\"}}"; + @Language("HOCON") String secondNodeAttributes = "{region.value: US, storage.value: SSD}"; // This node pass the filter but storage profiles of a node do not match zone's storage profiles. // TODO: https://issues.apache.org/jira/browse/IGNITE-21387 recovery of this node is failing, @@ -210,7 +210,7 @@ void testAlteringFiltersPropagatedDataNodesToStableImmediately() throws Exceptio TIMEOUT_MILLIS ); - @Language("HOCON") String firstNodeAttributes = "{region:{attribute:\"US\"},storage:{attribute:\"SSD\"}}"; + @Language("HOCON") String firstNodeAttributes = "{region.value: US, storage.value: SSD}"; // This node pass the filter startNode(1, createStartConfig(firstNodeAttributes, STORAGE_PROFILES_CONFIGS)); @@ -265,7 +265,7 @@ void testEmptyDataNodesDoNotPropagatedToStableAfterAlteringFilter() throws Excep TIMEOUT_MILLIS ); - @Language("HOCON") String firstNodeAttributes = "{region:{attribute:\"US\"},storage:{attribute:\"SSD\"}}"; + @Language("HOCON") String firstNodeAttributes = "{region.value: US, storage.value: SSD}"; // This node pass the filter startNode(1, createStartConfig(firstNodeAttributes, STORAGE_PROFILES_CONFIGS)); @@ -306,7 +306,7 @@ void testFilteredEmptyDataNodesDoNotTriggerRebalance() throws Exception { Ignite node0 = unwrapIgniteImpl(node(0)); // This node passes the filter - @Language("HOCON") String firstNodeAttributes = "{region:{attribute:\"EU\"},storage:{attribute:\"HDD\"}}"; + @Language("HOCON") String firstNodeAttributes = "{region.value: EU, storage.value: HDD}"; Ignite node1 = startNode(1, createStartConfig(firstNodeAttributes, STORAGE_PROFILES_CONFIGS)); @@ -324,7 +324,7 @@ void testFilteredEmptyDataNodesDoNotTriggerRebalance() throws Exception { node1.sql().execute(null, createTableSql()); - TableManager tableManager = (TableManager) IgniteTestUtils.getFieldValue(node0, IgniteImpl.class, "distributedTblMgr"); + TableManager tableManager = IgniteTestUtils.getFieldValue(node0, IgniteImpl.class, "distributedTblMgr"); TableViewInternal table = (TableViewInternal) tableManager.table(TABLE_NAME); @@ -350,7 +350,7 @@ void testFilteredEmptyDataNodesDoNotTriggerRebalanceOnReplicaUpdate() throws Exc IgniteImpl node0 = unwrapIgniteImpl(node(0)); // This node passes the filter - @Language("HOCON") String firstNodeAttributes = "{region:{attribute:\"EU\"},storage:{attribute:\"HDD\"}}"; + @Language("HOCON") String firstNodeAttributes = "{region.value: EU, storage.value: HDD}"; startNode(1, createStartConfig(firstNodeAttributes, STORAGE_PROFILES_CONFIGS)); diff --git a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/BaseDistributionZoneManagerTest.java b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/BaseDistributionZoneManagerTest.java index 251e3bbd6038..89950dd90da7 100644 --- a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/BaseDistributionZoneManagerTest.java +++ b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/BaseDistributionZoneManagerTest.java @@ -90,7 +90,7 @@ public abstract class BaseDistributionZoneManagerTest extends BaseIgniteAbstract private final List components = new ArrayList<>(); @InjectConfiguration("mock.properties = {" - + PARTITION_DISTRIBUTION_RESET_TIMEOUT + ".propertyValue = \"" + IMMEDIATE_TIMER_VALUE + "\", " + + PARTITION_DISTRIBUTION_RESET_TIMEOUT + ".value = \"" + IMMEDIATE_TIMER_VALUE + "\", " + "}") SystemDistributedConfiguration systemDistributedConfiguration; diff --git a/modules/distribution-zones/tech-notes/filters.md b/modules/distribution-zones/tech-notes/filters.md index 0cad552679f3..228093ca9d93 100644 --- a/modules/distribution-zones/tech-notes/filters.md +++ b/modules/distribution-zones/tech-notes/filters.md @@ -16,8 +16,8 @@ In the `ignite-config.conf` it looks like this: ``` nodeAttributes.nodeAttributes { - region.attribute = "US" - storage.attribute = "SSD" + region.value = "US" + storage.value = "SSD" } ``` @@ -28,10 +28,10 @@ or like this in a `ignite-config.json`: "nodeAttributes":{ "nodeAttributes":{ "region":{ - "attribute":"US" + "value":"US" }, "storage":{ - "attribute":"SSD" + "value":"SSD" } } } @@ -65,6 +65,3 @@ To check all capabilities of JSONPath, see https://github.com/json-path/JsonPath Note that as a default value for filter '$..*' filter is used, meaning that all nodes match the filter. Also it is important, that if there are no specified attributes for a node, it means that a node match only the default filter. - - - diff --git a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/TestMetasStorageUtils.java b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/TestMetasStorageUtils.java index 67deee870735..8a7017c626e3 100644 --- a/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/TestMetasStorageUtils.java +++ b/modules/metastorage/src/integrationTest/java/org/apache/ignite/internal/metastorage/TestMetasStorageUtils.java @@ -81,8 +81,8 @@ public static boolean equals(Entry act, Entry exp) { public static String createClusterConfigWithCompactionProperties(long interval, long dataAvailabilityTime) { return String.format( "ignite.system.properties: {" - + "%s.propertyValue= \"%s\", " - + "%s.propertyValue= \"%s\"" + + "%s.value= \"%s\", " + + "%s.value= \"%s\"" + "}", INTERVAL_SYSTEM_PROPERTY_NAME, interval, DATA_AVAILABILITY_TIME_SYSTEM_PROPERTY_NAME, dataAvailabilityTime ); diff --git a/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/impl/MetaStorageCompactionTriggerConfigurationTest.java b/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/impl/MetaStorageCompactionTriggerConfigurationTest.java index 296fed8b9364..2e14160ae24f 100644 --- a/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/impl/MetaStorageCompactionTriggerConfigurationTest.java +++ b/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/impl/MetaStorageCompactionTriggerConfigurationTest.java @@ -52,8 +52,8 @@ void testEmptySystemProperties(@InjectConfiguration SystemDistributedConfigurati @Test void testValidSystemPropertiesOnStart( @InjectConfiguration("mock.properties = {" - + INTERVAL_SYSTEM_PROPERTY_NAME + ".propertyValue = \"100\", " - + DATA_AVAILABILITY_TIME_SYSTEM_PROPERTY_NAME + ".propertyValue = \"500\"" + + INTERVAL_SYSTEM_PROPERTY_NAME + ".value = \"100\", " + + DATA_AVAILABILITY_TIME_SYSTEM_PROPERTY_NAME + ".value = \"500\"" + "}") SystemDistributedConfiguration systemConfig ) { diff --git a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java index efc7e87d0732..5243b26477ab 100644 --- a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java +++ b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/ItReplicaLifecycleTest.java @@ -256,13 +256,13 @@ public class ItReplicaLifecycleTest extends BaseIgniteAbstractTest { @InjectConfiguration private static SystemLocalConfiguration systemConfiguration; - @InjectConfiguration("mock.nodeAttributes: {region.attribute = US, storage.attribute = SSD}") + @InjectConfiguration("mock.nodeAttributes: {region.value = US, storage.value = SSD}") private static NodeAttributesConfiguration nodeAttributes1; - @InjectConfiguration("mock.nodeAttributes: {region.attribute = EU, storage.attribute = SSD}") + @InjectConfiguration("mock.nodeAttributes: {region.value = EU, storage.value = SSD}") private static NodeAttributesConfiguration nodeAttributes2; - @InjectConfiguration("mock.nodeAttributes: {region.attribute = UK, storage.attribute = SSD}") + @InjectConfiguration("mock.nodeAttributes: {region.value = UK, storage.value = SSD}") private static NodeAttributesConfiguration nodeAttributes3; @InjectConfiguration diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java index 9a221c555158..38127caaa2ad 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java @@ -1013,8 +1013,8 @@ public void changeNodeAttributesConfigurationOnStartTest() { stopNode(0); String newAttributesCfg = "{\n" - + " region.attribute = \"US\"\n" - + " storage.attribute = \"SSD\"\n" + + " region.value = \"US\"\n" + + " storage.value = \"SSD\"\n" + "}"; Map newAttributesMap = Map.of("region", "US", "storage", "SSD"); diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItReplicaStateManagerTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItReplicaStateManagerTest.java index 6f2cd40ea401..a9cd550c366f 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItReplicaStateManagerTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItReplicaStateManagerTest.java @@ -52,9 +52,9 @@ */ public class ItReplicaStateManagerTest extends BaseIgniteRestartTest { private static final String[] ATTRIBUTES = { - "{region:{attribute:\"REG0\"}}", - "{region:{attribute:\"REG1\"}}", - "{region:{attribute:\"REG2\"}}" + "{ region.value: REG0 }", + "{ region.value: REG1 }", + "{ region.value: REG2 }" }; private static final String ZONE_NAME = "TEST_ZONE"; diff --git a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItUnstableTopologyTest.java b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItUnstableTopologyTest.java index 6c703266b789..979e019ba3f5 100644 --- a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItUnstableTopologyTest.java +++ b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItUnstableTopologyTest.java @@ -37,7 +37,7 @@ public class ItUnstableTopologyTest extends BaseSqlIntegrationTest { + " },\n" + " clientConnector: { port:{} },\n" + " nodeAttributes: {\n" - + " nodeAttributes: {role: {attribute: \"data\"}}\n" + + " nodeAttributes: { role.value: data }\n" + " },\n" + " rest.port: {},\n" + " failureHandler.dumpThreadsOnFailure: false\n" diff --git a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/distributed/disaster/ItHighAvailablePartitionsRecoveryByFilterUpdateTest.java b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/distributed/disaster/ItHighAvailablePartitionsRecoveryByFilterUpdateTest.java index 08dc440b6a82..28b8e8bcfccc 100644 --- a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/distributed/disaster/ItHighAvailablePartitionsRecoveryByFilterUpdateTest.java +++ b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/distributed/disaster/ItHighAvailablePartitionsRecoveryByFilterUpdateTest.java @@ -24,11 +24,11 @@ /** Test suite for the cases with a recovery of the group replication factor after reset by zone filter update. */ public class ItHighAvailablePartitionsRecoveryByFilterUpdateTest extends AbstractHighAvailablePartitionsRecoveryTest { - private static final String GLOBAL_EU_NODES_CONFIG = nodeConfig("{region.attribute = EU, zone.attribute = global}"); + private static final String GLOBAL_EU_NODES_CONFIG = nodeConfig("{region.value = EU, zone.value = global}"); - private static final String EU_ONLY_NODES_CONFIG = nodeConfig("{region.attribute = EU}"); + private static final String EU_ONLY_NODES_CONFIG = nodeConfig("{region.value = EU}"); - private static final String GLOBAL_NODES_CONFIG = nodeConfig("{zone.attribute = global}"); + private static final String GLOBAL_NODES_CONFIG = nodeConfig("{zone.value = global}"); @Override protected int initialNodes() {