This is an automated email from the ASF dual-hosted git repository.
ibessonov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 5799a7a1e5 IGNITE-20358 Make data storage engine configuration local
(#2571)
5799a7a1e5 is described below
commit 5799a7a1e5d8ae1da16e1554ad0e56d644ec9c8a
Author: Kirill Gusakov <[email protected]>
AuthorDate: Wed Oct 4 10:14:59 2023 +0300
IGNITE-20358 Make data storage engine configuration local (#2571)
---
.../ignite/example/AbstractExamplesTest.java | 23 ++++++++++++++-
.../storage/ItPageMemoryStorageExampleTest.java | 4 +--
.../storage/ItRocksdbStorageExampleTest.java | 2 +-
.../configuration/ItShowConfigurationCallTest.java | 4 +--
.../ItUpdateConfigurationCallTest.java | 14 ++++-----
.../repl/executor/ItIgnitePicocliCommandsTest.java | 4 ++-
.../internal/rest/ItGeneratedRestClientTest.java | 4 +--
...ava => PageMemoryLocalConfigurationModule.java} | 4 +--
.../rebalance/ItRebalanceDistributedTest.java | 34 +++++++++-------------
.../rest/ItInitializedClusterRestTest.java | 12 ++++----
.../runner/app/ItIgniteNodeRestartTest.java | 9 +++---
.../org/apache/ignite/internal/app/IgniteImpl.java | 4 +--
...va => TestStorageLocalConfigurationModule.java} | 4 +--
...moryStorageEngineLocalConfigurationModule.java} | 7 ++---
...PageMemoryStorageEngineConfigurationSchema.java | 4 +--
...PageMemoryStorageEngineConfigurationSchema.java | 4 +--
...ksDbStorageEngineLocalConfigurationModule.java} | 4 +--
.../RocksDbStorageEngineConfigurationSchema.java | 4 +--
18 files changed, 79 insertions(+), 66 deletions(-)
diff --git
a/examples/src/integrationTest/java/org/apache/ignite/example/AbstractExamplesTest.java
b/examples/src/integrationTest/java/org/apache/ignite/example/AbstractExamplesTest.java
index 1d0aa9a302..f7c4485826 100644
---
a/examples/src/integrationTest/java/org/apache/ignite/example/AbstractExamplesTest.java
+++
b/examples/src/integrationTest/java/org/apache/ignite/example/AbstractExamplesTest.java
@@ -20,6 +20,8 @@ package org.apache.ignite.example;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
import static org.hamcrest.MatcherAssert.assertThat;
+import java.io.IOException;
+import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -28,12 +30,15 @@ import org.apache.ignite.IgnitionManager;
import org.apache.ignite.InitParameters;
import org.apache.ignite.internal.app.IgniteImpl;
import org.apache.ignite.internal.testframework.IgniteAbstractTest;
+import org.apache.ignite.internal.testframework.WorkDirectoryExtension;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
/**
* Base class for creating tests for examples.
*/
+@ExtendWith(WorkDirectoryExtension.class)
public abstract class AbstractExamplesTest extends IgniteAbstractTest {
private static final String TEST_NODE_NAME = "ignite-node";
@@ -50,7 +55,7 @@ public abstract class AbstractExamplesTest extends
IgniteAbstractTest {
public void startNode() throws Exception {
CompletableFuture<Ignite> igniteFuture = IgnitionManager.start(
TEST_NODE_NAME,
- Path.of("config", "ignite-config.conf"),
+ configFile(),
workDir
);
@@ -75,4 +80,20 @@ public abstract class AbstractExamplesTest extends
IgniteAbstractTest {
public void stopNode() {
IgnitionManager.stop(TEST_NODE_NAME);
}
+
+ /**
+ * Copy the original node configuration file to the temporary directory.
+ * It needs for the safety reasons: some tests can mutate local
configurations (for example storage tests)
+ * and mutate this file as a result. So, further tests will run with
inappropriate configuration.
+ *
+ * @return The path of the copied configuration file.
+ * @throws IOException If an I/O error occurs during the file copying
process.
+ */
+ private Path configFile() throws IOException {
+ var configFileName = "ignite-config.conf";
+
+ return Files.copy(
+ Path.of("config", configFileName),
+ workDir.resolve(configFileName));
+ }
}
diff --git
a/examples/src/integrationTest/java/org/apache/ignite/example/storage/ItPageMemoryStorageExampleTest.java
b/examples/src/integrationTest/java/org/apache/ignite/example/storage/ItPageMemoryStorageExampleTest.java
index 8a51270f65..d97612689d 100644
---
a/examples/src/integrationTest/java/org/apache/ignite/example/storage/ItPageMemoryStorageExampleTest.java
+++
b/examples/src/integrationTest/java/org/apache/ignite/example/storage/ItPageMemoryStorageExampleTest.java
@@ -58,14 +58,14 @@ public class ItPageMemoryStorageExampleTest extends
AbstractExamplesTest {
}
private void addVolatileDataRegionConfig(String name) throws Exception {
-
ignite.clusterConfiguration().getConfiguration(VolatilePageMemoryStorageEngineConfiguration.KEY)
+
ignite.nodeConfiguration().getConfiguration(VolatilePageMemoryStorageEngineConfiguration.KEY)
.regions()
.change(regionsChange -> regionsChange.create(name, c -> {}))
.get(1, TimeUnit.SECONDS);
}
private void addPersistentDataRegionConfig(String name) throws Exception {
-
ignite.clusterConfiguration().getConfiguration(PersistentPageMemoryStorageEngineConfiguration.KEY)
+
ignite.nodeConfiguration().getConfiguration(PersistentPageMemoryStorageEngineConfiguration.KEY)
.regions()
.change(regionsChange -> regionsChange.create(name, c -> {}))
.get(1, TimeUnit.SECONDS);
diff --git
a/examples/src/integrationTest/java/org/apache/ignite/example/storage/ItRocksdbStorageExampleTest.java
b/examples/src/integrationTest/java/org/apache/ignite/example/storage/ItRocksdbStorageExampleTest.java
index a9fc15b2d6..caff4a32b1 100644
---
a/examples/src/integrationTest/java/org/apache/ignite/example/storage/ItRocksdbStorageExampleTest.java
+++
b/examples/src/integrationTest/java/org/apache/ignite/example/storage/ItRocksdbStorageExampleTest.java
@@ -42,7 +42,7 @@ public class ItRocksdbStorageExampleTest extends
AbstractExamplesTest {
}
private void addDataRegionConfig(String name) throws Exception {
-
ignite.clusterConfiguration().getConfiguration(RocksDbStorageEngineConfiguration.KEY)
+
ignite.nodeConfiguration().getConfiguration(RocksDbStorageEngineConfiguration.KEY)
.regions()
.change(regionsChange -> regionsChange.create(name,
regionChange -> {}))
.get(1, TimeUnit.SECONDS);
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/configuration/ItShowConfigurationCallTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/configuration/ItShowConfigurationCallTest.java
index ccf64d89f7..d925bdbfda 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/configuration/ItShowConfigurationCallTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/configuration/ItShowConfigurationCallTest.java
@@ -59,7 +59,7 @@ class ItShowConfigurationCallTest extends
CallInitializedIntegrationTestBase {
// Given
var input = ClusterConfigShowCallInput.builder()
.clusterUrl(NODE_URL)
- .selector("rocksDb.defaultRegion.cache")
+ .selector("gc.onUpdateBatchSize")
.build();
// When
@@ -68,7 +68,7 @@ class ItShowConfigurationCallTest extends
CallInitializedIntegrationTestBase {
// Then
assertThat(output.hasError()).isFalse();
// And
- assertThat(output.body().getValue()).isEqualTo("lru");
+ assertThat(output.body().getValue()).isEqualTo("5");
}
@Test
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/configuration/ItUpdateConfigurationCallTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/configuration/ItUpdateConfigurationCallTest.java
index 7eab198d6b..1407042b04 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/configuration/ItUpdateConfigurationCallTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/call/configuration/ItUpdateConfigurationCallTest.java
@@ -40,12 +40,12 @@ public class ItUpdateConfigurationCallTest extends
CallInitializedIntegrationTes
@DisplayName("Should update cluster configuration")
void shouldUpdateClusterConfiguration() {
// Given default write buffer size
- String givenConfigurationProperty =
readConfigurationProperty("rocksDb.defaultRegion.writeBufferSize");
- assertThat(givenConfigurationProperty).isEqualTo("67108864");
+ String givenConfigurationProperty =
readConfigurationProperty("gc.onUpdateBatchSize");
+ assertThat(givenConfigurationProperty).isEqualTo("5");
// And
var input = ClusterConfigUpdateCallInput.builder()
.clusterUrl(NODE_URL)
- .config("{rocksDb: {defaultRegion: {writeBufferSize: 1024}}}")
+ .config("{gc: {onUpdateBatchSize: 1}}")
.build();
// When update buffer size
@@ -56,19 +56,19 @@ public class ItUpdateConfigurationCallTest extends
CallInitializedIntegrationTes
// And
assertThat(output.body()).contains("Cluster configuration was updated
successfully");
// And buffer size is updated
- String updatedConfigurationProperty =
readConfigurationProperty("rocksDb.defaultRegion.writeBufferSize");
- assertThat(updatedConfigurationProperty).isEqualTo("1024");
+ String updatedConfigurationProperty =
readConfigurationProperty("gc.onUpdateBatchSize");
+ assertThat(updatedConfigurationProperty).isEqualTo("1");
// When update buffer size back to default but using key-value format
updateCall.execute(
ClusterConfigUpdateCallInput.builder()
.clusterUrl(NODE_URL)
-
.config("rocksDb.defaultRegion.writeBufferSize=67108864")
+ .config("gc.onUpdateBatchSize=5")
.build()
);
// Then buffer size is updated
-
assertThat(readConfigurationProperty("rocksDb.defaultRegion.writeBufferSize")).isEqualTo("67108864");
+
assertThat(readConfigurationProperty("gc.onUpdateBatchSize")).isEqualTo("5");
}
private String readConfigurationProperty(String selector) {
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/core/repl/executor/ItIgnitePicocliCommandsTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/core/repl/executor/ItIgnitePicocliCommandsTest.java
index cbbeb5f7cd..70ab657df8 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/core/repl/executor/ItIgnitePicocliCommandsTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/core/repl/executor/ItIgnitePicocliCommandsTest.java
@@ -265,7 +265,9 @@ public class ItIgnitePicocliCommandsTest extends
CliCommandTestInitializedIntegr
// wait for lazy init of node config completer
await("For given parsed words: " + givenParsedLine.words()).until(
() -> complete(givenParsedLine),
- containsInAnyOrder("rest", "clientConnector", "network",
"cluster", "deployment", "nodeAttributes")
+ containsInAnyOrder(
+ "rest", "clientConnector", "network", "cluster",
"deployment", "nodeAttributes", "aimem", "aipersist", "rocksDb"
+ )
);
}
diff --git
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/rest/ItGeneratedRestClientTest.java
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/rest/ItGeneratedRestClientTest.java
index 0f380eb237..294bbdcffc 100644
---
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/rest/ItGeneratedRestClientTest.java
+++
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/rest/ItGeneratedRestClientTest.java
@@ -201,7 +201,7 @@ public class ItGeneratedRestClientTest {
@Test
void getClusterConfigurationByPath() {
assertDoesNotThrow(() -> {
- String configuration =
clusterConfigurationApi.getClusterConfigurationByPath("rocksDb.defaultRegion");
+ String configuration =
clusterConfigurationApi.getClusterConfigurationByPath("gc.onUpdateBatchSize");
assertNotNull(configuration);
assertFalse(configuration.isEmpty());
@@ -286,7 +286,7 @@ public class ItGeneratedRestClientTest {
void updateNodeConfigurationWithInvalidParam() throws
JsonProcessingException {
ApiException thrown = assertThrows(
ApiException.class,
- () ->
clusterConfigurationApi.updateClusterConfiguration("rocksDb.defaultRegion.cache=invalid")
+ () ->
clusterConfigurationApi.updateClusterConfiguration("security.authentication.enabled=true")
);
Problem problem = objectMapper.readValue(thrown.getResponseBody(),
Problem.class);
diff --git
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/configuration/PageMemoryDistributedConfigurationModule.java
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/configuration/PageMemoryLocalConfigurationModule.java
similarity index 92%
rename from
modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/configuration/PageMemoryDistributedConfigurationModule.java
rename to
modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/configuration/PageMemoryLocalConfigurationModule.java
index db5fac672f..e09d1440de 100644
---
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/configuration/PageMemoryDistributedConfigurationModule.java
+++
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/configuration/PageMemoryLocalConfigurationModule.java
@@ -28,11 +28,11 @@ import
org.apache.ignite.internal.pagememory.configuration.schema.UnsafeMemoryAl
* {@link ConfigurationModule} for cluster-wide configuration provided by
ignite-page-memory.
*/
@AutoService(ConfigurationModule.class)
-public class PageMemoryDistributedConfigurationModule implements
ConfigurationModule {
+public class PageMemoryLocalConfigurationModule implements ConfigurationModule
{
/** {@inheritDoc} */
@Override
public ConfigurationType type() {
- return ConfigurationType.DISTRIBUTED;
+ return ConfigurationType.LOCAL;
}
/** {@inheritDoc} */
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
index 4618809cbe..65448062f2 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
@@ -147,12 +147,9 @@ import
org.apache.ignite.internal.storage.DataStorageModules;
import org.apache.ignite.internal.storage.StorageException;
import org.apache.ignite.internal.storage.impl.TestDataStorageModule;
import org.apache.ignite.internal.storage.impl.TestStorageEngine;
-import
org.apache.ignite.internal.storage.impl.schema.TestDataStorageConfigurationSchema;
import
org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryDataStorageModule;
import
org.apache.ignite.internal.storage.pagememory.VolatilePageMemoryDataStorageModule;
-import
org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryDataStorageConfigurationSchema;
import
org.apache.ignite.internal.storage.pagememory.configuration.schema.PersistentPageMemoryStorageEngineConfiguration;
-import
org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryDataStorageConfigurationSchema;
import
org.apache.ignite.internal.storage.pagememory.configuration.schema.VolatilePageMemoryStorageEngineConfiguration;
import org.apache.ignite.internal.table.InternalTable;
import org.apache.ignite.internal.table.TableImpl;
@@ -779,12 +776,21 @@ public class ItRebalanceDistributedTest extends
BaseIgniteAbstractTest {
vaultManager = createVault(name, dir);
nodeCfgGenerator = new ConfigurationTreeGenerator(
- NetworkConfiguration.KEY, RestConfiguration.KEY,
ClientConnectorConfiguration.KEY
+ List.of(
+ NetworkConfiguration.KEY,
+ RestConfiguration.KEY,
+ ClientConnectorConfiguration.KEY,
+ PersistentPageMemoryStorageEngineConfiguration.KEY,
+ VolatilePageMemoryStorageEngineConfiguration.KEY),
+ List.of(),
+ List.of(UnsafeMemoryAllocatorConfigurationSchema.class)
);
Path configPath = workDir.resolve(testInfo.getDisplayName());
nodeCfgMgr = new ConfigurationManager(
List.of(NetworkConfiguration.KEY,
+ PersistentPageMemoryStorageEngineConfiguration.KEY,
+ VolatilePageMemoryStorageEngineConfiguration.KEY,
RestConfiguration.KEY,
ClientConnectorConfiguration.KEY),
new LocalFileConfigurationStorage(configPath,
nodeCfgGenerator),
@@ -864,24 +870,10 @@ public class ItRebalanceDistributedTest extends
BaseIgniteAbstractTest {
cfgStorage = new
DistributedConfigurationStorage(metaStorageManager);
- clusterCfgGenerator = new ConfigurationTreeGenerator(
- List.of(
- PersistentPageMemoryStorageEngineConfiguration.KEY,
- VolatilePageMemoryStorageEngineConfiguration.KEY,
- GcConfiguration.KEY
- ),
- List.of(),
- List.of(
-
VolatilePageMemoryDataStorageConfigurationSchema.class,
- UnsafeMemoryAllocatorConfigurationSchema.class,
-
PersistentPageMemoryDataStorageConfigurationSchema.class,
- TestDataStorageConfigurationSchema.class
- )
- );
+ clusterCfgGenerator = new
ConfigurationTreeGenerator(GcConfiguration.KEY);
+
clusterCfgMgr = new ConfigurationManager(
List.of(
- PersistentPageMemoryStorageEngineConfiguration.KEY,
- VolatilePageMemoryStorageEngineConfiguration.KEY,
GcConfiguration.KEY
),
cfgStorage,
@@ -907,7 +899,7 @@ public class ItRebalanceDistributedTest extends
BaseIgniteAbstractTest {
dataStorageMgr = new DataStorageManager(
dataStorageModules.createStorageEngines(
name,
- clusterConfigRegistry,
+ nodeCfgMgr.configurationRegistry(),
dir.resolve("storage"),
null
)
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/ItInitializedClusterRestTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/ItInitializedClusterRestTest.java
index 2e1d166c9c..7cc9027144 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/ItInitializedClusterRestTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/rest/ItInitializedClusterRestTest.java
@@ -129,7 +129,7 @@ public class ItInitializedClusterRestTest extends
AbstractRestTestBase {
// And configuration can be parsed to hocon format
Config config = ConfigFactory.parseString(response.body());
// And rocksDb.defaultRegion.cache can be read
- assertThat(config.getString("rocksDb.defaultRegion.cache"),
is(equalTo("lru")));
+ assertThat(config.getInt("gc.onUpdateBatchSize"), is(equalTo(5)));
}
@Test
@@ -137,7 +137,7 @@ public class ItInitializedClusterRestTest extends
AbstractRestTestBase {
void clusterConfigurationUpdate() throws IOException, InterruptedException
{
// When PATCH /management/v1/configuration/cluster
HttpResponse<String> patchRequest = client.send(
- patch("/management/v1/configuration/cluster",
"rocksDb.defaultRegion.writeBufferSize=1024"),
+ patch("/management/v1/configuration/cluster",
"gc.onUpdateBatchSize=1"),
BodyHandlers.ofString()
);
@@ -148,7 +148,7 @@ public class ItInitializedClusterRestTest extends
AbstractRestTestBase {
assertThat(getResponse.statusCode(), is(200));
// And
Config config = ConfigFactory.parseString(getResponse.body());
- assertThat(config.getInt("rocksDb.defaultRegion.writeBufferSize"),
is(1024));
+ assertThat(config.getInt("gc.onUpdateBatchSize"), is(equalTo(1)));
}
@Test
@@ -156,7 +156,7 @@ public class ItInitializedClusterRestTest extends
AbstractRestTestBase {
void clusterConfigurationUpdateValidation() throws IOException,
InterruptedException {
// When PATCH /management/v1/configuration/cluster invalid with
invalid value
HttpResponse<String> patchRequest = client.send(
- patch("/management/v1/configuration/cluster",
"rocksDb.defaultRegion.cache=invalid"),
+ patch("/management/v1/configuration/cluster",
"security.authentication.enabled=true"),
BodyHandlers.ofString()
);
@@ -171,7 +171,7 @@ public class ItInitializedClusterRestTest extends
AbstractRestTestBase {
void clusterConfigurationByPath() throws IOException, InterruptedException
{
// When GET /management/v1/configuration/cluster and path selector is
"rocksDb.defaultRegion"
HttpResponse<String> response = client.send(
-
get("/management/v1/configuration/cluster/rocksDb.defaultRegion"),
+ get("/management/v1/configuration/cluster/gc"),
BodyHandlers.ofString()
);
@@ -180,7 +180,7 @@ public class ItInitializedClusterRestTest extends
AbstractRestTestBase {
// And configuration can be parsed to hocon format
Config config = ConfigFactory.parseString(response.body());
// And rocksDb.defaultRegion.cache can be read
- assertThat(config.getString("cache"), is(equalTo("lru")));
+ assertThat(config.getInt("onUpdateBatchSize"), is(equalTo(5)));
}
@Test
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 ef56c24106..97a0019bca 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
@@ -110,7 +110,6 @@ import
org.apache.ignite.internal.sql.engine.SqlQueryProcessor;
import org.apache.ignite.internal.storage.DataStorageManager;
import org.apache.ignite.internal.storage.DataStorageModule;
import org.apache.ignite.internal.storage.DataStorageModules;
-import
org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbStorageEngineConfiguration;
import org.apache.ignite.internal.table.TableImpl;
import org.apache.ignite.internal.table.distributed.TableManager;
import org.apache.ignite.internal.table.distributed.TableMessageGroup;
@@ -1155,10 +1154,10 @@ public class ItIgniteNodeRestartTest extends
BaseIgniteRestartTest {
public void updateClusterCfgWithDefaultValue() {
IgniteImpl ignite = startNode(0);
- RocksDbStorageEngineConfiguration dbStorageEngineConfiguration =
ignite.clusterConfiguration()
- .getConfiguration(RocksDbStorageEngineConfiguration.KEY);
- int defaultValue =
dbStorageEngineConfiguration.flushDelayMillis().value();
- CompletableFuture<Void> update =
dbStorageEngineConfiguration.flushDelayMillis().update(defaultValue);
+ GcConfiguration gcConfiguration = ignite.clusterConfiguration()
+ .getConfiguration(GcConfiguration.KEY);
+ int defaultValue = gcConfiguration.onUpdateBatchSize().value();
+ CompletableFuture<Void> update =
gcConfiguration.onUpdateBatchSize().update(defaultValue);
assertThat(update, willCompleteSuccessfully());
stopNode(0);
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
index a3990a7afb..9b1cc38fab 100644
---
a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
+++
b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
@@ -507,7 +507,7 @@ public class IgniteImpl implements Ignite {
dataStorageMgr = new DataStorageManager(
dataStorageModules.createStorageEngines(
name,
- clusterConfigRegistry,
+ nodeConfigRegistry,
storagePath,
longJvmPauseDetector
)
@@ -585,7 +585,7 @@ public class IgniteImpl implements Ignite {
distributedTblMgr,
schemaManager,
dataStorageMgr,
- () ->
dataStorageModules.collectSchemasFields(modules.distributed().polymorphicSchemaExtensions()),
+ () ->
dataStorageModules.collectSchemasFields(modules.local().polymorphicSchemaExtensions()),
replicaSvc,
clock,
catalogManager,
diff --git
a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestStorageEngineDistributedConfigurationModule.java
b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestStorageLocalConfigurationModule.java
similarity index 91%
rename from
modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestStorageEngineDistributedConfigurationModule.java
rename to
modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestStorageLocalConfigurationModule.java
index b6ea4c28ba..08ef335c95 100644
---
a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestStorageEngineDistributedConfigurationModule.java
+++
b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestStorageLocalConfigurationModule.java
@@ -28,11 +28,11 @@ import
org.apache.ignite.internal.storage.impl.schema.TestDataStorageConfigurati
* Implementation for {@link TestStorageEngine}.
*/
@AutoService(ConfigurationModule.class)
-public class TestStorageEngineDistributedConfigurationModule implements
ConfigurationModule {
+public class TestStorageLocalConfigurationModule implements
ConfigurationModule {
/** {@inheritDoc} */
@Override
public ConfigurationType type() {
- return ConfigurationType.DISTRIBUTED;
+ return ConfigurationType.LOCAL;
}
/** {@inheritDoc} */
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/PageMemoryStorageEngineDistributedConfigurationModule.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/PageMemoryStorageEngineLocalConfigurationModule.java
similarity index 94%
rename from
modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/PageMemoryStorageEngineDistributedConfigurationModule.java
rename to
modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/PageMemoryStorageEngineLocalConfigurationModule.java
index ccfb73c1b2..afbab492e0 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/PageMemoryStorageEngineDistributedConfigurationModule.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/PageMemoryStorageEngineLocalConfigurationModule.java
@@ -34,11 +34,11 @@ import
org.apache.ignite.internal.storage.pagememory.configuration.schema.Volati
* {@link ConfigurationModule} for cluster-wide configuration provided by
ignite-storage-page-memory.
*/
@AutoService(ConfigurationModule.class)
-public class PageMemoryStorageEngineDistributedConfigurationModule implements
ConfigurationModule {
+public class PageMemoryStorageEngineLocalConfigurationModule implements
ConfigurationModule {
/** {@inheritDoc} */
@Override
public ConfigurationType type() {
- return ConfigurationType.DISTRIBUTED;
+ return ConfigurationType.LOCAL;
}
/** {@inheritDoc} */
@@ -52,8 +52,7 @@ public class
PageMemoryStorageEngineDistributedConfigurationModule implements Co
public Collection<Class<?>> polymorphicSchemaExtensions() {
return List.of(
VolatilePageMemoryDataStorageConfigurationSchema.class,
- PersistentPageMemoryDataStorageConfigurationSchema.class
- );
+ PersistentPageMemoryDataStorageConfigurationSchema.class);
}
/** {@inheritDoc} */
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/schema/PersistentPageMemoryStorageEngineConfigurationSchema.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/schema/PersistentPageMemoryStorageEngineConfigurationSchema.java
index b9bfee7191..86704d5c49 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/schema/PersistentPageMemoryStorageEngineConfigurationSchema.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/schema/PersistentPageMemoryStorageEngineConfigurationSchema.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.storage.pagememory.configuration.schema;
-import static
org.apache.ignite.configuration.annotation.ConfigurationType.DISTRIBUTED;
+import static
org.apache.ignite.configuration.annotation.ConfigurationType.LOCAL;
import static
org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryStorageEngine.ENGINE_NAME;
import org.apache.ignite.configuration.annotation.ConfigValue;
@@ -32,7 +32,7 @@ import
org.apache.ignite.internal.storage.pagememory.PersistentPageMemoryStorage
/**
* Root configuration for {@link PersistentPageMemoryStorageEngine}.
*/
-@ConfigurationRoot(rootName = ENGINE_NAME, type = DISTRIBUTED)
+@ConfigurationRoot(rootName = ENGINE_NAME, type = LOCAL)
public class PersistentPageMemoryStorageEngineConfigurationSchema extends
BasePageMemoryStorageEngineConfigurationSchema {
/** Default data region. */
@Name(DEFAULT_DATA_REGION_NAME)
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/schema/VolatilePageMemoryStorageEngineConfigurationSchema.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/schema/VolatilePageMemoryStorageEngineConfigurationSchema.java
index afc42e45be..50b640311b 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/schema/VolatilePageMemoryStorageEngineConfigurationSchema.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/configuration/schema/VolatilePageMemoryStorageEngineConfigurationSchema.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.storage.pagememory.configuration.schema;
-import static
org.apache.ignite.configuration.annotation.ConfigurationType.DISTRIBUTED;
+import static
org.apache.ignite.configuration.annotation.ConfigurationType.LOCAL;
import static
org.apache.ignite.internal.storage.pagememory.VolatilePageMemoryStorageEngine.ENGINE_NAME;
import org.apache.ignite.configuration.annotation.ConfigValue;
@@ -31,7 +31,7 @@ import
org.apache.ignite.internal.storage.pagememory.VolatilePageMemoryStorageEn
/**
* Root configuration for {@link VolatilePageMemoryStorageEngine}.
*/
-@ConfigurationRoot(rootName = ENGINE_NAME, type = DISTRIBUTED)
+@ConfigurationRoot(rootName = ENGINE_NAME, type = LOCAL)
public class VolatilePageMemoryStorageEngineConfigurationSchema extends
BasePageMemoryStorageEngineConfigurationSchema {
/** Default data region. */
@Name(DEFAULT_DATA_REGION_NAME)
diff --git
a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/configuration/RocksDbStorageEngineDistributedConfigurationModule.java
b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/configuration/RocksDbStorageEngineLocalConfigurationModule.java
similarity index 93%
rename from
modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/configuration/RocksDbStorageEngineDistributedConfigurationModule.java
rename to
modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/configuration/RocksDbStorageEngineLocalConfigurationModule.java
index 7c5ead211e..67d8773c6f 100644
---
a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/configuration/RocksDbStorageEngineDistributedConfigurationModule.java
+++
b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/configuration/RocksDbStorageEngineLocalConfigurationModule.java
@@ -32,11 +32,11 @@ import
org.apache.ignite.internal.storage.rocksdb.configuration.schema.RocksDbSt
* {@link ConfigurationModule} for cluster-wide configuration provided by
ignite-storage-rocksdb.
*/
@AutoService(ConfigurationModule.class)
-public class RocksDbStorageEngineDistributedConfigurationModule implements
ConfigurationModule {
+public class RocksDbStorageEngineLocalConfigurationModule implements
ConfigurationModule {
/** {@inheritDoc} */
@Override
public ConfigurationType type() {
- return ConfigurationType.DISTRIBUTED;
+ return ConfigurationType.LOCAL;
}
/** {@inheritDoc} */
diff --git
a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/configuration/schema/RocksDbStorageEngineConfigurationSchema.java
b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/configuration/schema/RocksDbStorageEngineConfigurationSchema.java
index 2b7164479f..c0527b8fde 100644
---
a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/configuration/schema/RocksDbStorageEngineConfigurationSchema.java
+++
b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/configuration/schema/RocksDbStorageEngineConfigurationSchema.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.storage.rocksdb.configuration.schema;
-import static
org.apache.ignite.configuration.annotation.ConfigurationType.DISTRIBUTED;
+import static
org.apache.ignite.configuration.annotation.ConfigurationType.LOCAL;
import org.apache.ignite.configuration.annotation.ConfigValue;
import org.apache.ignite.configuration.annotation.ConfigurationRoot;
@@ -31,7 +31,7 @@ import
org.apache.ignite.internal.storage.rocksdb.RocksDbStorageEngine;
/**
* Root configuration for {@link RocksDbStorageEngine}.
*/
-@ConfigurationRoot(rootName = "rocksDb", type = DISTRIBUTED)
+@ConfigurationRoot(rootName = "rocksDb", type = LOCAL)
public class RocksDbStorageEngineConfigurationSchema {
/** Name of the default data region. */
public static final String DEFAULT_DATA_REGION_NAME = "default";
