You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ib...@apache.org on 2025/05/05 12:27:34 UTC

(ignite-3) branch main updated: IGNITE-25041 Support configuration deletion (#5728)

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 6f846c6caae IGNITE-25041 Support configuration deletion (#5728)
6f846c6caae is described below

commit 6f846c6caaedf52cc71e733165ff2d07b5d9aecb
Author: Phillippko <ph...@gmail.com>
AuthorDate: Mon May 5 19:27:29 2025 +0700

    IGNITE-25041 Support configuration deletion (#5728)
---
 .../java/org/apache/ignite/client/TestServer.java  |   3 +-
 .../ignite/configuration/ConfigurationModule.java  |  14 ++
 .../apache/ignite/configuration/KeyIgnorer.java}   |  32 ++--
 .../presentation/HoconPresentation.java            |   2 +-
 .../presentation/HoconPresentationTest.java        |   3 +-
 .../configuration/ConfigurationChanger.java        |  39 ++++-
 .../ConfigurationDynamicDefaultsPatcherImpl.java   |   5 +-
 .../configuration/ConfigurationManager.java        |  29 ++-
 .../configuration/ConfigurationRegistry.java       |  35 +++-
 .../internal/configuration/DeletedKeysFilter.java  |  47 +++++
 .../configuration/hocon/HoconConverter.java        |  14 +-
 .../hocon/HoconListConfigurationSource.java        |  18 +-
 .../hocon/HoconObjectConfigurationSource.java      |  23 ++-
 .../hocon/HoconPrimitiveConfigurationSource.java   |  17 +-
 .../configuration/ConfigurationChangerTest.java    |   6 +-
 .../configuration/ConfigurationRegistryTest.java   |  27 +--
 .../configuration/DeletedConfigurationTest.java    | 195 +++++++++++++++++++++
 .../InjectedValueConfigurationTest.java            |   3 +-
 .../asm/ConfigurationTreeGeneratorTest.java        |   3 +-
 .../deprecation/DeprecatedConfigurationTest.java   |   3 +-
 .../configuration/direct/DirectPropertiesTest.java |   3 +-
 .../configuration/hocon/HoconConverterTest.java    |   3 +-
 .../ConfigurationAnyListenerTest.java              |   3 +-
 .../notifications/ConfigurationListenerTest.java   |   3 +-
 .../internal/configuration/sample/UsageTest.java   |   6 +-
 .../configuration/tree/InternalIdTest.java         |   3 +-
 .../configuration/tree/NamedListNodeTest.java      |   3 +-
 .../configuration/TestConfigurationChanger.java    |  16 +-
 ...niteDistributionZoneManagerNodeRestartTest.java |   6 +-
 .../rebalance/ItRebalanceDistributedTest.java      |   6 +-
 .../network/utils/ClusterServiceTestUtils.java     |   3 +-
 .../partition/replicator/fixtures/Node.java        |   6 +-
 .../ignite/internal/rest/RestComponentTest.java    |   3 +-
 .../internal/rest/configuration/TestFactory.java   |   3 +-
 .../configuration/generator/DefaultsGenerator.java |  10 +-
 .../ItDistributedConfigurationPropertiesTest.java  |   3 +-
 .../runner/app/ItIgniteNodeRestartTest.java        |   6 +-
 .../org/apache/ignite/internal/app/IgniteImpl.java |   7 +-
 .../internal/configuration/CompoundModule.java     |   5 +
 .../storage/LocalFileConfigurationStorage.java     |   5 +-
 .../storage/LocalFileConfigurationModule.java      |   6 +
 .../storage/LocalFileConfigurationStorageTest.java |  20 ++-
 42 files changed, 523 insertions(+), 124 deletions(-)

diff --git a/modules/client/src/test/java/org/apache/ignite/client/TestServer.java b/modules/client/src/test/java/org/apache/ignite/client/TestServer.java
index b7fb490f655..34194725490 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/TestServer.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/TestServer.java
@@ -183,8 +183,7 @@ public class TestServer implements AutoCloseable {
                 List.of(NodeConfiguration.KEY),
                 new TestConfigurationStorage(LOCAL),
                 generator,
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
 
         ComponentContext componentContext = new ComponentContext();
diff --git a/modules/configuration-api/src/main/java/org/apache/ignite/configuration/ConfigurationModule.java b/modules/configuration-api/src/main/java/org/apache/ignite/configuration/ConfigurationModule.java
index f3e928d1eac..855ac89adc8 100644
--- a/modules/configuration-api/src/main/java/org/apache/ignite/configuration/ConfigurationModule.java
+++ b/modules/configuration-api/src/main/java/org/apache/ignite/configuration/ConfigurationModule.java
@@ -136,4 +136,18 @@ public interface ConfigurationModule {
     default void migrateDeprecatedConfigurations(SuperRootChange superRootChange) {
         // No-op.
     }
+
+    /**
+     * Returns a collection of prefixes, removed from configuration. Keys that match any of the prefixes
+     * in this collection will be deleted.
+     *
+     * <p>Use {@code ignite.my.deleted.property} for regular deleted properties
+     *
+     * <p>{@code ignite.list.*.deletedProperty} - for named list elements. Arbitrarily nested named lists are supported
+     *
+     * @return A collection of prefixes of deleted keys.
+     */
+    default Collection<String> deletedPrefixes() {
+        return emptySet();
+    }
 }
diff --git a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/storage/LocalFileConfigurationModule.java b/modules/configuration-api/src/main/java/org/apache/ignite/configuration/KeyIgnorer.java
similarity index 50%
copy from modules/runner/src/test/java/org/apache/ignite/internal/configuration/storage/LocalFileConfigurationModule.java
copy to modules/configuration-api/src/main/java/org/apache/ignite/configuration/KeyIgnorer.java
index a8331c721e1..123e0420210 100644
--- a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/storage/LocalFileConfigurationModule.java
+++ b/modules/configuration-api/src/main/java/org/apache/ignite/configuration/KeyIgnorer.java
@@ -15,25 +15,25 @@
  * limitations under the License.
  */
 
-package org.apache.ignite.internal.configuration.storage;
+package org.apache.ignite.configuration;
 
 import java.util.Collection;
-import java.util.List;
-import org.apache.ignite.configuration.ConfigurationModule;
-import org.apache.ignite.configuration.RootKey;
-import org.apache.ignite.configuration.annotation.ConfigurationType;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
-/**
- * Module for {@link LocalFileConfigurationStorageTest}.
- */
-class LocalFileConfigurationModule implements ConfigurationModule {
-    @Override
-    public ConfigurationType type() {
-        return ConfigurationType.LOCAL;
-    }
+/** Determines if key should be ignored while processing configuration. */
+@FunctionalInterface
+public interface KeyIgnorer {
+    /** Returns true if key should be ignored. */
+    boolean shouldIgnore(String key);
+
+    /** Creates a key ignorer that uses specified deletedPrefixes. */
+    static KeyIgnorer fromDeletedPrefixes(Collection<String> deletedPrefixes) {
+        Collection<Pattern> patterns = deletedPrefixes.stream()
+                .map(deletedKey -> deletedKey.replace(".", "\\.").replace("*", "[^.]*") + "(\\..*)?")
+                .map(Pattern::compile)
+                .collect(Collectors.toList());
 
-    @Override
-    public Collection<RootKey<?, ?>> rootKeys() {
-        return List.of(TopConfiguration.KEY);
+        return key -> patterns.stream().anyMatch(pattern -> pattern.matcher(key).matches());
     }
 }
diff --git a/modules/configuration-presentation/src/main/java/org/apache/ignite/internal/configuration/presentation/HoconPresentation.java b/modules/configuration-presentation/src/main/java/org/apache/ignite/internal/configuration/presentation/HoconPresentation.java
index 80cb0ca5c73..e0e79372fe2 100644
--- a/modules/configuration-presentation/src/main/java/org/apache/ignite/internal/configuration/presentation/HoconPresentation.java
+++ b/modules/configuration-presentation/src/main/java/org/apache/ignite/internal/configuration/presentation/HoconPresentation.java
@@ -78,7 +78,7 @@ public class HoconPresentation implements ConfigurationPresentation<String> {
             return CompletableFuture.failedFuture(new IllegalArgumentException(e));
         }
 
-        return registry.change(HoconConverter.hoconSource(config.root()))
+        return registry.change(HoconConverter.hoconSource(config.root(), registry.keyIgnorer()))
                 .exceptionally(e -> {
                     if (e instanceof CompletionException) {
                         e = e.getCause();
diff --git a/modules/configuration-presentation/src/test/java/org/apache/ignite/internal/configuration/presentation/HoconPresentationTest.java b/modules/configuration-presentation/src/test/java/org/apache/ignite/internal/configuration/presentation/HoconPresentationTest.java
index c8e2dfc4d3a..d72a9c6696e 100644
--- a/modules/configuration-presentation/src/test/java/org/apache/ignite/internal/configuration/presentation/HoconPresentationTest.java
+++ b/modules/configuration-presentation/src/test/java/org/apache/ignite/internal/configuration/presentation/HoconPresentationTest.java
@@ -88,8 +88,7 @@ public class HoconPresentationTest {
                 List.of(TestRootConfiguration.KEY),
                 new TestConfigurationStorage(LOCAL),
                 generator,
-                ConfigurationValidatorImpl.withDefaultValidators(generator, Set.of(validator)),
-                changer -> {}
+                ConfigurationValidatorImpl.withDefaultValidators(generator, Set.of(validator))
         );
 
         assertThat(cfgRegistry.startAsync(new ComponentContext()), willCompleteSuccessfully());
diff --git a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationChanger.java b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationChanger.java
index 5e4df905c86..5816de8d11e 100644
--- a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationChanger.java
+++ b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationChanger.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.configuration;
 import static java.util.function.Function.identity;
 import static java.util.regex.Pattern.quote;
 import static java.util.stream.Collectors.toMap;
+import static org.apache.ignite.internal.configuration.DeletedKeysFilter.ignoreDeleted;
 import static org.apache.ignite.internal.configuration.direct.KeyPathNode.INTERNAL_IDS;
 import static org.apache.ignite.internal.configuration.tree.InnerNode.INJECTED_NAME;
 import static org.apache.ignite.internal.configuration.tree.InnerNode.INTERNAL_ID;
@@ -56,6 +57,7 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.Function;
 import org.apache.ignite.configuration.ConfigurationChangeException;
+import org.apache.ignite.configuration.KeyIgnorer;
 import org.apache.ignite.configuration.RootKey;
 import org.apache.ignite.configuration.validation.ConfigurationValidationException;
 import org.apache.ignite.configuration.validation.ValidationIssue;
@@ -97,6 +99,9 @@ public abstract class ConfigurationChanger implements DynamicConfigurationChange
     /** Configuration migrator. */
     private final ConfigurationMigrator migrator;
 
+    /** Determines if key should be ignored. */
+    private final KeyIgnorer keyIgnorer;
+
     /** Storage trees. */
     private volatile StorageRoots storageRoots;
 
@@ -118,6 +123,9 @@ public abstract class ConfigurationChanger implements DynamicConfigurationChange
     /** Flag indicating whether the component is started. */
     private final AtomicBoolean started = new AtomicBoolean(false);
 
+    /** Keys that were deleted from the configuration, but were present in the storage. Will be deleted on startup. */
+    private Collection<String> ignoredKeys;
+
     /**
      * Closure interface to be used by the configuration changer. An instance of this closure is passed into the constructor and invoked
      * every time when there's an update from any of the storages.
@@ -207,6 +215,7 @@ public abstract class ConfigurationChanger implements DynamicConfigurationChange
      * @param storage Configuration storage.
      * @param configurationValidator Configuration validator.
      * @param migrator Configuration migrator.
+     * @param keyIgnorer Determines if key should be ignored.
      * @throws IllegalArgumentException If the configuration type of the root keys is not equal to the storage type.
      */
     public ConfigurationChanger(
@@ -214,7 +223,8 @@ public abstract class ConfigurationChanger implements DynamicConfigurationChange
             Collection<RootKey<?, ?>> rootKeys,
             ConfigurationStorage storage,
             ConfigurationValidator configurationValidator,
-            ConfigurationMigrator migrator
+            ConfigurationMigrator migrator,
+            KeyIgnorer keyIgnorer
     ) {
         checkConfigurationType(rootKeys, storage);
 
@@ -223,6 +233,8 @@ public abstract class ConfigurationChanger implements DynamicConfigurationChange
         this.configurationValidator = configurationValidator;
         this.rootKeys = rootKeys.stream().collect(toMap(RootKey::key, identity()));
         this.migrator = migrator;
+
+        this.keyIgnorer = keyIgnorer;
     }
 
     /**
@@ -263,6 +275,9 @@ public abstract class ConfigurationChanger implements DynamicConfigurationChange
         }
 
         Map<String, ? extends Serializable> storageValues = data.values();
+
+        ignoredKeys = ignoreDeleted(storageValues, keyIgnorer);
+
         long revision = data.changeId();
 
         SuperRoot superRoot = new SuperRoot(rootCreator());
@@ -303,18 +318,18 @@ public abstract class ConfigurationChanger implements DynamicConfigurationChange
 
         storage.registerConfigurationListener(configurationStorageListener());
 
-        persistDefaults();
+        persistModifiedConfiguration();
 
         started.set(true);
     }
 
     /**
-     * Persists default values to the storage.
+     * Persists configuration to the storage on startup.
      *
      * <p>Specifically, this method runs a check whether there are
-     * default values that are not persisted to the storage and writes them if there are any.
+     * default values that are not persisted to the storage and writes them if there are any, or deletes values that were deprecated.
      */
-    private void persistDefaults() {
+    private void persistModifiedConfiguration() {
         // If the storage version is 0, it indicates that the storage is empty.
         // In this case, write the defaults along with the initial configuration.
         ConfigurationSource cfgSrc = storageRoots.data.changeId() == 0 ? initialConfiguration : ConfigurationUtil.EMPTY_CFG_SRC;
@@ -621,8 +636,15 @@ public abstract class ConfigurationChanger implements DynamicConfigurationChange
             migrator.migrate(new SuperRootChangeImpl(changes));
 
             Map<String, Serializable> allChanges = createFlattenedUpdatesMap(localRoots.rootsWithoutDefaults, changes);
+
             dropUnnecessarilyDeletedKeys(allChanges, localRoots);
 
+            if (onStartup) {
+                for (String ignoredValue : ignoredKeys) {
+                    allChanges.put(ignoredValue, null);
+                }
+            }
+
             if (allChanges.isEmpty() && onStartup) {
                 // We don't want an empty storage update if this is the initialization changer.
                 return nullCompletedFuture();
@@ -670,6 +692,11 @@ public abstract class ConfigurationChanger implements DynamicConfigurationChange
 
     private ConfigurationStorageListener configurationStorageListener() {
         return changedEntries -> {
+            Map<String, ? extends Serializable> changedValues = changedEntries.values();
+
+            // We need to ignore deletion of deprecated values.
+            ignoreDeleted(changedValues, keyIgnorer);
+
             StorageRoots oldStorageRoots = storageRoots;
 
             SuperRoot oldSuperRoot = oldStorageRoots.roots;
@@ -677,7 +704,7 @@ public abstract class ConfigurationChanger implements DynamicConfigurationChange
             SuperRoot newSuperRoot = oldSuperRoot.copy();
             SuperRoot newSuperNoDefaults = oldSuperRootNoDefaults.copy();
 
-            Map<String, ?> dataValuesPrefixMap = toPrefixMap(changedEntries.values());
+            Map<String, ?> dataValuesPrefixMap = toPrefixMap(changedValues);
 
             compressDeletedEntries(dataValuesPrefixMap);
 
diff --git a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationDynamicDefaultsPatcherImpl.java b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationDynamicDefaultsPatcherImpl.java
index 687d442903b..8d7f4d3ab82 100644
--- a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationDynamicDefaultsPatcherImpl.java
+++ b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationDynamicDefaultsPatcherImpl.java
@@ -23,6 +23,7 @@ import com.typesafe.config.ConfigRenderOptions;
 import java.util.List;
 import org.apache.ignite.configuration.ConfigurationDynamicDefaultsPatcher;
 import org.apache.ignite.configuration.ConfigurationModule;
+import org.apache.ignite.configuration.KeyIgnorer;
 import org.apache.ignite.configuration.SuperRootChange;
 import org.apache.ignite.configuration.validation.ConfigurationValidationException;
 import org.apache.ignite.internal.configuration.hocon.HoconConverter;
@@ -76,7 +77,9 @@ public class ConfigurationDynamicDefaultsPatcherImpl implements ConfigurationDyn
     private SuperRoot convertToSuperRoot(String hocon) {
         try {
             Config config = ConfigFactory.parseString(hocon);
-            ConfigurationSource hoconSource = HoconConverter.hoconSource(config.root());
+            KeyIgnorer keyIgnorer = KeyIgnorer.fromDeletedPrefixes(configurationModule.deletedPrefixes());
+
+            ConfigurationSource hoconSource = HoconConverter.hoconSource(config.root(), keyIgnorer);
 
             SuperRoot superRoot = generator.createSuperRoot();
             hoconSource.descend(superRoot);
diff --git a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationManager.java b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationManager.java
index a99f9947e93..1c17d56ff2a 100644
--- a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationManager.java
+++ b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationManager.java
@@ -19,11 +19,13 @@ package org.apache.ignite.internal.configuration;
 
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
+import org.apache.ignite.configuration.KeyIgnorer;
 import org.apache.ignite.configuration.RootKey;
 import org.apache.ignite.internal.configuration.storage.ConfigurationStorage;
 import org.apache.ignite.internal.configuration.validation.ConfigurationValidator;
 import org.apache.ignite.internal.manager.ComponentContext;
 import org.apache.ignite.internal.manager.IgniteComponent;
+import org.jetbrains.annotations.TestOnly;
 
 /**
  * Configuration manager is responsible for handling configuration lifecycle and provides configuration API.
@@ -32,28 +34,41 @@ public class ConfigurationManager implements IgniteComponent {
     /** Configuration registry. */
     private final ConfigurationRegistry registry;
 
+    @TestOnly
+    public ConfigurationManager(
+            Collection<RootKey<?, ?>> rootKeys,
+            ConfigurationStorage storage,
+            ConfigurationTreeGenerator generator,
+            ConfigurationValidator configurationValidator
+    ) {
+        this(rootKeys, storage, generator, configurationValidator, changer -> {}, s -> false);
+    }
+
     /**
      * Constructor.
      *
-     * @param rootKeys                    Configuration root keys.
-     * @param storage                     Configuration storage.
-     * @param generator                   Configuration tree generator.
-     * @throws IllegalArgumentException If the configuration type of the root keys is not equal to the storage type, or if the schema or its
-     *                                  extensions are not valid.
+     * @param rootKeys Configuration root keys.
+     * @param storage Configuration storage.
+     * @param generator Configuration tree generator.
+     * @param keyIgnorer Determines if key should be ignored.
+     * @throws IllegalArgumentException If the configuration type of the root keys is not equal to the storage type, or if the
+     *         schema or its extensions are not valid.
      */
     public ConfigurationManager(
             Collection<RootKey<?, ?>> rootKeys,
             ConfigurationStorage storage,
             ConfigurationTreeGenerator generator,
             ConfigurationValidator configurationValidator,
-            ConfigurationMigrator migrator
+            ConfigurationMigrator migrator,
+            KeyIgnorer keyIgnorer
     ) {
         registry = new ConfigurationRegistry(
                 rootKeys,
                 storage,
                 generator,
                 configurationValidator,
-                migrator
+                migrator,
+                keyIgnorer
         );
     }
 
diff --git a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationRegistry.java b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationRegistry.java
index e242077e179..17fab3c7f3a 100644
--- a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationRegistry.java
+++ b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationRegistry.java
@@ -30,6 +30,7 @@ import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import org.apache.ignite.configuration.ConfigurationTree;
+import org.apache.ignite.configuration.KeyIgnorer;
 import org.apache.ignite.configuration.RootKey;
 import org.apache.ignite.configuration.SuperRootChange;
 import org.apache.ignite.configuration.notifications.ConfigurationListener;
@@ -47,6 +48,7 @@ import org.apache.ignite.internal.logger.Loggers;
 import org.apache.ignite.internal.manager.ComponentContext;
 import org.apache.ignite.internal.manager.IgniteComponent;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
 
 /**
  * Configuration registry.
@@ -61,6 +63,20 @@ public class ConfigurationRegistry implements IgniteComponent {
     /** Configuration change handler. */
     private final ConfigurationChanger changer;
 
+    /** Determines if key should be ignored. */
+    private final KeyIgnorer keyIgnorer;
+
+    /** Constructor. */
+    @TestOnly
+    public ConfigurationRegistry(
+            Collection<RootKey<?, ?>> rootKeys,
+            ConfigurationStorage storage,
+            ConfigurationTreeGenerator generator,
+            ConfigurationValidator configurationValidator
+    ) {
+        this(rootKeys, storage, generator, configurationValidator, c -> {}, s -> false);
+    }
+
     /**
      * Constructor.
      */
@@ -69,11 +85,21 @@ public class ConfigurationRegistry implements IgniteComponent {
             ConfigurationStorage storage,
             ConfigurationTreeGenerator generator,
             ConfigurationValidator configurationValidator,
-            ConfigurationMigrator migrator
+            ConfigurationMigrator migrator,
+            KeyIgnorer keyIgnorer
     ) {
         checkConfigurationType(rootKeys, storage);
 
-        changer = new ConfigurationChanger(notificationUpdateListener(), rootKeys, storage, configurationValidator, migrator) {
+        this.keyIgnorer = keyIgnorer;
+
+        changer = new ConfigurationChanger(
+                notificationUpdateListener(),
+                rootKeys,
+                storage,
+                configurationValidator,
+                migrator,
+                keyIgnorer
+        ) {
             @Override
             public InnerNode createRootNode(RootKey<?, ?> rootKey) {
                 return generator.instantiateNode(rootKey.schemaClass());
@@ -225,6 +251,11 @@ public class ConfigurationRegistry implements IgniteComponent {
         };
     }
 
+    /** Determines if key should be ignored. */
+    public KeyIgnorer keyIgnorer() {
+        return keyIgnorer;
+    }
+
     /**
      * Notifies all listeners of the current configuration.
      *
diff --git a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/DeletedKeysFilter.java b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/DeletedKeysFilter.java
new file mode 100644
index 00000000000..f0a9181aa4e
--- /dev/null
+++ b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/DeletedKeysFilter.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.configuration;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.apache.ignite.configuration.KeyIgnorer;
+
+class DeletedKeysFilter {
+    /**
+     * Filters out keys that match the deleted prefixes and returns the ignored keys.
+     *
+     * @param values The map of values to filter.
+     * @param keyIgnorer Determines if a key should be ignored.
+     * @return A collection of keys that were ignored.
+     */
+    static Collection<String> ignoreDeleted(
+            Map<String, ? extends Serializable> values,
+            KeyIgnorer keyIgnorer
+    ) {
+        Set<String> ignoredKeys = values.keySet().stream()
+                .filter(keyIgnorer::shouldIgnore)
+                .collect(Collectors.toSet());
+
+        values.keySet().removeAll(ignoredKeys);
+
+        return ignoredKeys;
+    }
+}
diff --git a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconConverter.java b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconConverter.java
index c82a5fd8683..376350a1d18 100644
--- a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconConverter.java
+++ b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconConverter.java
@@ -21,6 +21,7 @@ import com.typesafe.config.ConfigObject;
 import com.typesafe.config.ConfigValue;
 import com.typesafe.config.impl.ConfigImpl;
 import java.util.List;
+import org.apache.ignite.configuration.KeyIgnorer;
 import org.apache.ignite.internal.configuration.ConfigurationConverter;
 import org.apache.ignite.internal.configuration.tree.ConfigurationSource;
 import org.apache.ignite.internal.configuration.tree.ConfigurationVisitor;
@@ -76,6 +77,17 @@ public class HoconConverter {
      * @return HOCON-based configuration source.
      */
     public static ConfigurationSource hoconSource(ConfigObject hoconCfg) {
-        return new HoconObjectConfigurationSource(null, List.of(), hoconCfg);
+        return hoconSource(hoconCfg, s -> false);
+    }
+
+    /**
+     * Returns HOCON-based configuration source.
+     *
+     * @param hoconCfg HOCON that has to be converted to the configuration source.
+     * @param keyIgnorer Determines if key should be ignored.
+     * @return HOCON-based configuration source.
+     */
+    public static ConfigurationSource hoconSource(ConfigObject hoconCfg, KeyIgnorer keyIgnorer) {
+        return new HoconObjectConfigurationSource(null, keyIgnorer, List.of(), hoconCfg);
     }
 }
diff --git a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconListConfigurationSource.java b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconListConfigurationSource.java
index e1c1486e9f5..689d16fed67 100644
--- a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconListConfigurationSource.java
+++ b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconListConfigurationSource.java
@@ -32,6 +32,7 @@ import com.typesafe.config.ConfigValueType;
 import java.lang.reflect.Array;
 import java.util.Iterator;
 import java.util.List;
+import org.apache.ignite.configuration.KeyIgnorer;
 import org.apache.ignite.internal.configuration.TypeUtils;
 import org.apache.ignite.internal.configuration.tree.ConfigurationSource;
 import org.apache.ignite.internal.configuration.tree.ConstructableTreeNode;
@@ -46,6 +47,9 @@ class HoconListConfigurationSource implements ConfigurationSource {
      */
     private final List<String> path;
 
+    /** Determines if key should be ignored. */
+    private final KeyIgnorer keyIgnorer;
+
     /**
      * HOCON list that this source has been created from.
      */
@@ -54,11 +58,13 @@ class HoconListConfigurationSource implements ConfigurationSource {
     /**
      * Creates a {@link ConfigurationSource} from the given HOCON list.
      *
-     * @param path         Current path inside the top-level HOCON object. Can be empty if the given {@code hoconCfgList} is the top-level
-     *                     object.
+     * @param keyIgnorer Determines if key should be ignored.
+     * @param path Current path inside the top-level HOCON object. Can be empty if the given {@code hoconCfgList} is the top-level
+     *         object.
      * @param hoconCfgList HOCON list.
      */
-    HoconListConfigurationSource(List<String> path, ConfigList hoconCfgList) {
+    HoconListConfigurationSource(KeyIgnorer keyIgnorer, List<String> path, ConfigList hoconCfgList) {
+        this.keyIgnorer = keyIgnorer;
         this.path = path;
         this.hoconCfgList = hoconCfgList;
     }
@@ -105,6 +111,10 @@ class HoconListConfigurationSource implements ConfigurationSource {
 
         String syntheticKeyName = ((NamedListNode<?>) node).syntheticKeyName();
 
+        if (keyIgnorer.shouldIgnore(join(appendKey(path, syntheticKeyName)))) {
+            return;
+        }
+
         for (int idx = 0; idx < hoconCfgList.size(); idx++) {
             ConfigValue next = hoconCfgList.get(idx);
 
@@ -139,7 +149,7 @@ class HoconListConfigurationSource implements ConfigurationSource {
                 ));
             }
 
-            node.construct(key, new HoconObjectConfigurationSource(syntheticKeyName, path, hoconCfg), false);
+            node.construct(key, new HoconObjectConfigurationSource(syntheticKeyName, keyIgnorer, path, hoconCfg), false);
         }
     }
 
diff --git a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconObjectConfigurationSource.java b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconObjectConfigurationSource.java
index b6a39978609..8ee59d88069 100644
--- a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconObjectConfigurationSource.java
+++ b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconObjectConfigurationSource.java
@@ -29,6 +29,7 @@ import com.typesafe.config.ConfigValueType;
 import java.util.List;
 import java.util.NoSuchElementException;
 import org.apache.ignite.configuration.ConfigurationWrongPolymorphicTypeIdException;
+import org.apache.ignite.configuration.KeyIgnorer;
 import org.apache.ignite.internal.configuration.tree.ConfigurationSource;
 import org.apache.ignite.internal.configuration.tree.ConstructableTreeNode;
 import org.jetbrains.annotations.Nullable;
@@ -42,6 +43,9 @@ class HoconObjectConfigurationSource implements ConfigurationSource {
      */
     private final String ignoredKey;
 
+    /** Determines if key should be ignored. */
+    private final KeyIgnorer keyIgnorer;
+
     /**
      * Current path inside the top-level HOCON object.
      */
@@ -56,12 +60,19 @@ class HoconObjectConfigurationSource implements ConfigurationSource {
      * Creates a {@link ConfigurationSource} from the given HOCON object.
      *
      * @param ignoredKey     Key that needs to be ignored by the source. Can be {@code null}.
+     * @param keyIgnorer Determines if key should be ignored.
      * @param path           Current path inside the top-level HOCON object. Can be empty if the given {@code hoconCfgObject} is the
      *                       top-level object.
      * @param hoconCfgObject HOCON object.
      */
-    HoconObjectConfigurationSource(@Nullable String ignoredKey, List<String> path, ConfigObject hoconCfgObject) {
+    HoconObjectConfigurationSource(
+            @Nullable String ignoredKey,
+            KeyIgnorer keyIgnorer,
+            List<String> path,
+            ConfigObject hoconCfgObject
+    ) {
         this.ignoredKey = ignoredKey;
+        this.keyIgnorer = keyIgnorer;
         this.path = path;
         this.hoconCfgObject = hoconCfgObject;
     }
@@ -87,6 +98,10 @@ class HoconObjectConfigurationSource implements ConfigurationSource {
     }
 
     private void parseConfigEntry(String key, ConfigValue hoconCfgValue, ConstructableTreeNode node) {
+        if (keyIgnorer.shouldIgnore(join(appendKey(path, key)))) {
+            return;
+        }
+
         if (key.equals(ignoredKey)) {
             return;
         }
@@ -103,7 +118,7 @@ class HoconObjectConfigurationSource implements ConfigurationSource {
 
                     node.construct(
                             key,
-                            new HoconObjectConfigurationSource(null, path, (ConfigObject) hoconCfgValue),
+                            new HoconObjectConfigurationSource(null, keyIgnorer, path, (ConfigObject) hoconCfgValue),
                             false
                     );
 
@@ -113,7 +128,7 @@ class HoconObjectConfigurationSource implements ConfigurationSource {
                 case LIST: {
                     List<String> path = appendKey(this.path, key);
 
-                    node.construct(key, new HoconListConfigurationSource(path, (ConfigList) hoconCfgValue), false);
+                    node.construct(key, new HoconListConfigurationSource(keyIgnorer, path, (ConfigList) hoconCfgValue), false);
 
                     break;
                 }
@@ -121,7 +136,7 @@ class HoconObjectConfigurationSource implements ConfigurationSource {
                 default: {
                     List<String> path = appendKey(this.path, key);
 
-                    node.construct(key, new HoconPrimitiveConfigurationSource(path, hoconCfgValue), false);
+                    node.construct(key, new HoconPrimitiveConfigurationSource(keyIgnorer, path, hoconCfgValue), false);
                 }
             }
         } catch (NoSuchElementException e) {
diff --git a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconPrimitiveConfigurationSource.java b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconPrimitiveConfigurationSource.java
index ec9f40bb58f..2e43382cf41 100644
--- a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconPrimitiveConfigurationSource.java
+++ b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/hocon/HoconPrimitiveConfigurationSource.java
@@ -21,11 +21,13 @@ import static com.typesafe.config.ConfigValueType.BOOLEAN;
 import static com.typesafe.config.ConfigValueType.NUMBER;
 import static com.typesafe.config.ConfigValueType.STRING;
 import static java.lang.String.format;
+import static org.apache.ignite.internal.configuration.util.ConfigurationUtil.appendKey;
 import static org.apache.ignite.internal.configuration.util.ConfigurationUtil.join;
 
 import com.typesafe.config.ConfigValue;
 import java.util.List;
 import java.util.UUID;
+import org.apache.ignite.configuration.KeyIgnorer;
 import org.apache.ignite.internal.configuration.TypeUtils;
 import org.apache.ignite.internal.configuration.tree.ConfigurationSource;
 import org.apache.ignite.internal.configuration.tree.ConstructableTreeNode;
@@ -44,18 +46,23 @@ class HoconPrimitiveConfigurationSource implements ConfigurationSource {
      */
     private final ConfigValue hoconCfgValue;
 
+    /** Determines if key should be ignored. */
+    private final KeyIgnorer keyIgnorer;
+
     /**
      * Creates a {@link ConfigurationSource} from the given HOCON object representing a primitive type.
      *
-     * @param path          current path inside the top-level HOCON object. Can be empty if the given {@code hoconCfgValue} is the top-level
-     *                      object
+     * @param keyIgnorer Determines if key should be ignored.
+     * @param path current path inside the top-level HOCON object. Can be empty if the given {@code hoconCfgValue} is the top-level
+     *         object
      * @param hoconCfgValue HOCON object
      */
-    HoconPrimitiveConfigurationSource(List<String> path, ConfigValue hoconCfgValue) {
+    HoconPrimitiveConfigurationSource(KeyIgnorer keyIgnorer, List<String> path, ConfigValue hoconCfgValue) {
         assert !path.isEmpty();
 
         this.path = path;
         this.hoconCfgValue = hoconCfgValue;
+        this.keyIgnorer = keyIgnorer;
     }
 
     @Override
@@ -77,6 +84,10 @@ class HoconPrimitiveConfigurationSource implements ConfigurationSource {
             );
         }
 
+        if (keyIgnorer.shouldIgnore(join(appendKey(path, fieldName)))) {
+            return;
+        }
+
         node.construct(fieldName, this, false);
     }
 
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/ConfigurationChangerTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/ConfigurationChangerTest.java
index fae6f64ce63..f868c6f04aa 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/ConfigurationChangerTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/ConfigurationChangerTest.java
@@ -226,8 +226,7 @@ public class ConfigurationChangerTest {
                 List.of(KEY),
                 storage,
                 generator,
-                ConfigurationValidatorImpl.withDefaultValidators(generator, Set.of(validator)),
-                change -> {}
+                ConfigurationValidatorImpl.withDefaultValidators(generator, Set.of(validator))
         );
 
         changer2.start();
@@ -607,8 +606,7 @@ public class ConfigurationChangerTest {
                 List.of(rootKey),
                 storage,
                 generator,
-                new TestConfigurationValidator(),
-                change -> {}
+                new TestConfigurationValidator()
         );
     }
 
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/ConfigurationRegistryTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/ConfigurationRegistryTest.java
index 8e50996e211..785946b9def 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/ConfigurationRegistryTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/ConfigurationRegistryTest.java
@@ -65,8 +65,7 @@ public class ConfigurationRegistryTest {
                                 List.of(ExtendedFirstRootConfigurationSchema.class),
                                 List.of()
                         ),
-                        new TestConfigurationValidator(),
-                        changer -> {}
+                        new TestConfigurationValidator()
                 )
         );
 
@@ -79,8 +78,7 @@ public class ConfigurationRegistryTest {
                         List.of(ExtendedFirstRootConfigurationSchema.class),
                         List.of()
                 ),
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
 
         assertThat(configRegistry.stopAsync(new ComponentContext()), willCompleteSuccessfully());
@@ -99,8 +97,7 @@ public class ConfigurationRegistryTest {
                                 List.of(),
                                 List.of(Second0PolymorphicConfigurationSchema.class)
                         ),
-                        new TestConfigurationValidator(),
-                        changer -> {}
+                        new TestConfigurationValidator()
                 )
         );
 
@@ -115,8 +112,7 @@ public class ConfigurationRegistryTest {
                                 List.of(),
                                 List.of(First0PolymorphicConfigurationSchema.class, ErrorFirst0PolymorphicConfigurationSchema.class)
                         ),
-                        new TestConfigurationValidator(),
-                        changer -> {}
+                        new TestConfigurationValidator()
                 )
         );
 
@@ -135,8 +131,7 @@ public class ConfigurationRegistryTest {
                                 Third1PolymorphicConfigurationSchema.class
                         )
                 ),
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
 
         assertThat(configRegistry.stopAsync(new ComponentContext()), willCompleteSuccessfully());
@@ -150,8 +145,7 @@ public class ConfigurationRegistryTest {
                         List.of(ThirdRootConfiguration.KEY),
                         new TestConfigurationStorage(LOCAL),
                         new ConfigurationTreeGenerator(ThirdRootConfiguration.KEY),
-                        new TestConfigurationValidator(),
-                        changer -> {}
+                        new TestConfigurationValidator()
                 )
         );
 
@@ -178,8 +172,7 @@ public class ConfigurationRegistryTest {
                         List.of(),
                         List.of(Fourth0PolymorphicConfigurationSchema.class)
                 ),
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
 
         assertThat(registry.startAsync(new ComponentContext()), willCompleteSuccessfully());
@@ -211,8 +204,7 @@ public class ConfigurationRegistryTest {
                                 Fourth0PolymorphicConfigurationSchema.class
                         )
                 ),
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
         assertThat(registry.startAsync(new ComponentContext()), willCompleteSuccessfully());
 
@@ -240,8 +232,7 @@ public class ConfigurationRegistryTest {
                 List.of(FirstRootConfiguration.KEY, SecondRootConfiguration.KEY),
                 storage,
                 new ConfigurationTreeGenerator(FirstRootConfiguration.KEY, SecondRootConfiguration.KEY),
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
 
         assertThat(registry.startAsync(new ComponentContext()), willCompleteSuccessfully());
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/DeletedConfigurationTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/DeletedConfigurationTest.java
new file mode 100644
index 00000000000..fc6fa6f4004
--- /dev/null
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/DeletedConfigurationTest.java
@@ -0,0 +1,195 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.configuration;
+
+import static org.apache.ignite.configuration.annotation.ConfigurationType.LOCAL;
+import static org.apache.ignite.internal.configuration.DeletedConfigurationTest.NestedListInstanceConfigurationSchema.NAMED_LIST_NAME;
+import static org.apache.ignite.internal.configuration.hocon.HoconConverter.hoconSource;
+import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willBe;
+import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+import com.typesafe.config.ConfigFactory;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Stream;
+import org.apache.ignite.configuration.ConfigurationModule;
+import org.apache.ignite.configuration.KeyIgnorer;
+import org.apache.ignite.configuration.RootKey;
+import org.apache.ignite.configuration.annotation.ConfigurationRoot;
+import org.apache.ignite.configuration.annotation.ConfigurationType;
+import org.apache.ignite.configuration.annotation.NamedConfigValue;
+import org.apache.ignite.configuration.annotation.PolymorphicConfig;
+import org.apache.ignite.configuration.annotation.PolymorphicConfigInstance;
+import org.apache.ignite.configuration.annotation.PolymorphicId;
+import org.apache.ignite.configuration.annotation.Value;
+import org.apache.ignite.internal.configuration.storage.TestConfigurationStorage;
+import org.apache.ignite.internal.configuration.tree.ConfigurationSource;
+import org.apache.ignite.internal.configuration.validation.TestConfigurationValidator;
+import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class DeletedConfigurationTest extends BaseIgniteAbstractTest {
+    ConfigurationModule configurationModule = new ConfigurationModule() {
+        @Override
+        public ConfigurationType type() {
+            return LOCAL;
+        }
+
+        @Override
+        public Collection<String> deletedPrefixes() {
+            return Set.of(
+                    DELETED_INDIVIDUAL_PROPERTY,
+                    DELETED_PROPERTY_MATCHING_PREFIX,
+                    DELETED_SUBTREE,
+                    SUBTREE_NAMED_LIST,
+                    NESTED_NAMED_LISTS
+            );
+        }
+    };
+
+    private static final String DELETED_INDIVIDUAL_PROPERTY = "key.individual_property";
+    private static final String DELETED_SUBTREE = "key.subtree";
+    private static final String SUBTREE_NAMED_LIST = "key.list.*.subtree";
+    private static final String NESTED_NAMED_LISTS = "key.list." + NAMED_LIST_NAME + ".*";
+    private static final String DELETED_PROPERTY_MATCHING_PREFIX = "key.some";
+
+    private static final String VALID_KEY = "key.someValue";
+
+    private static final ConfigurationTreeGenerator GENERATOR = new ConfigurationTreeGenerator(
+            Set.of(DeletedTestConfiguration.KEY),
+            Set.of(),
+            Set.of(NestedListInstanceConfigurationSchema.class)
+    );
+
+    private final TestConfigurationStorage storage = new TestConfigurationStorage(LOCAL);
+
+    private ConfigurationChanger changer;
+
+    @AfterAll
+    public static void afterAll() {
+        GENERATOR.close();
+    }
+
+    @AfterEach
+    void tearDown() {
+        storage.close();
+        changer.stop();
+    }
+
+    @ParameterizedTest
+    @MethodSource("deletedPropertiesProvider")
+    public void testPropertyDeleted(Map<String, String> deletedProperties) {
+        Map<String, String> fullConfig = new HashMap<>(deletedProperties);
+
+        fullConfig.put(VALID_KEY, "value");
+
+        changer = createChanger(DeletedTestConfiguration.KEY);
+
+        CompletableFuture<Boolean> write = storage.write(fullConfig, 0);
+        assertThat(write, willCompleteSuccessfully());
+
+        assertDoesNotThrow(changer::start);
+
+        CompletableFuture<Map<String, ? extends Serializable>> readFromStorage = storage.readAllLatest("");
+        Map<String, ? extends Serializable> storageData = readFromStorage.join();
+
+        assertThat(storageData.size(), is(1));
+
+        assertThat(storageData.get(VALID_KEY), Matchers.equalTo("value"));
+    }
+
+    @ParameterizedTest
+    @MethodSource("hoconConfigProvider")
+    public void testUserAddsDeletedValue(String hoconConfig) {
+        changer = createChanger(DeletedTestConfiguration.KEY);
+
+        changer.start();
+
+        String config = hoconConfig + ", " + VALID_KEY + " = \"new_value\"";
+        KeyIgnorer keyIgnorer = KeyIgnorer.fromDeletedPrefixes(configurationModule.deletedPrefixes());
+
+        ConfigurationSource change = hoconSource(ConfigFactory.parseString(config).root(), keyIgnorer);
+
+        assertThat(changer.change(change), willCompleteSuccessfully());
+
+        assertThat(storage.readLatest(VALID_KEY), willBe("new_value"));
+    }
+
+    private static Stream<String> hoconConfigProvider() {
+        return Stream.of(
+                DELETED_INDIVIDUAL_PROPERTY + " = \"deleted\"",
+                DELETED_SUBTREE + ".property = \"deleted\"",
+                SUBTREE_NAMED_LIST.replace("*", NAMED_LIST_NAME) + ".property = \"deleted\"",
+                NESTED_NAMED_LISTS.replace("*", NAMED_LIST_NAME) + ".property = \"deleted\""
+
+        );
+    }
+
+    private static Stream<Map<String, ? extends Serializable>> deletedPropertiesProvider() {
+        return Stream.of(
+                Map.of(DELETED_INDIVIDUAL_PROPERTY, "deleted"),
+                Map.of(DELETED_PROPERTY_MATCHING_PREFIX, "deleted"),
+                Map.of(DELETED_SUBTREE + ".property", "deleted"),
+                Map.of(SUBTREE_NAMED_LIST.replace("*", NAMED_LIST_NAME) + ".property", "deleted"),
+                Map.of(NESTED_NAMED_LISTS.replace("*", NAMED_LIST_NAME) + ".property", "deleted")
+        );
+    }
+
+    private ConfigurationChanger createChanger(RootKey<?, ?> rootKey) {
+        return new TestConfigurationChanger(
+                List.of(rootKey),
+                storage,
+                GENERATOR,
+                new TestConfigurationValidator(),
+                changer -> {},
+                KeyIgnorer.fromDeletedPrefixes(configurationModule.deletedPrefixes())
+        );
+    }
+
+    @ConfigurationRoot(rootName = "key", type = LOCAL)
+    public static class DeletedTestConfigurationSchema {
+        @Value(hasDefault = true)
+        public String someValue = "default";
+
+        @NamedConfigValue
+        public NestedListConfigurationSchema list;
+    }
+
+    @PolymorphicConfig
+    public static class NestedListConfigurationSchema {
+        @PolymorphicId(hasDefault = true)
+        public String name = NAMED_LIST_NAME;
+    }
+
+    @PolymorphicConfigInstance(NAMED_LIST_NAME)
+    public static class NestedListInstanceConfigurationSchema extends NestedListConfigurationSchema {
+        static final String NAMED_LIST_NAME = "named-list";
+    }
+}
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/InjectedValueConfigurationTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/InjectedValueConfigurationTest.java
index 5a3535adb58..5748ec4fa83 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/InjectedValueConfigurationTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/InjectedValueConfigurationTest.java
@@ -80,8 +80,7 @@ public class InjectedValueConfigurationTest {
                 roots,
                 new TestConfigurationStorage(LOCAL),
                 new ConfigurationTreeGenerator(roots, List.of(), List.of()),
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
 
         assertThat(registry.startAsync(new ComponentContext()), willCompleteSuccessfully());
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/asm/ConfigurationTreeGeneratorTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/asm/ConfigurationTreeGeneratorTest.java
index 1b988968dc7..ace55ac0129 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/asm/ConfigurationTreeGeneratorTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/asm/ConfigurationTreeGeneratorTest.java
@@ -119,8 +119,7 @@ public class ConfigurationTreeGeneratorTest {
                 rootKeys,
                 new TestConfigurationStorage(LOCAL),
                 generator,
-                new TestConfigurationValidator(),
-                change -> {}
+                new TestConfigurationValidator()
         );
 
         changer.start();
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/deprecation/DeprecatedConfigurationTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/deprecation/DeprecatedConfigurationTest.java
index ebfe0851fce..b7146bfe3de 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/deprecation/DeprecatedConfigurationTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/deprecation/DeprecatedConfigurationTest.java
@@ -407,7 +407,8 @@ public class DeprecatedConfigurationTest extends BaseIgniteAbstractTest {
                 storage,
                 new ConfigurationTreeGenerator(rootKey),
                 new TestConfigurationValidator(),
-                migrator
+                migrator,
+                s -> false
         );
 
         if (init) {
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/direct/DirectPropertiesTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/direct/DirectPropertiesTest.java
index 454af8834bd..c3f64e8e1e3 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/direct/DirectPropertiesTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/direct/DirectPropertiesTest.java
@@ -110,8 +110,7 @@ public class DirectPropertiesTest {
                 List.of(DirectConfiguration.KEY),
                 new TestConfigurationStorage(LOCAL),
                 new ConfigurationTreeGenerator(DirectConfiguration.KEY),
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
 
         assertThat(registry.startAsync(new ComponentContext()), willCompleteSuccessfully());
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/hocon/HoconConverterTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/hocon/HoconConverterTest.java
index 91b00bc285a..13383c608cb 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/hocon/HoconConverterTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/hocon/HoconConverterTest.java
@@ -232,8 +232,7 @@ public class HoconConverterTest {
                                 HoconSecondPolymorphicInstanceConfigurationSchema.class
                         )
                 ),
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
 
         assertThat(registry.startAsync(new ComponentContext()), willCompleteSuccessfully());
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/notifications/ConfigurationAnyListenerTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/notifications/ConfigurationAnyListenerTest.java
index 54739efec60..ce4aaf811c5 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/notifications/ConfigurationAnyListenerTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/notifications/ConfigurationAnyListenerTest.java
@@ -168,8 +168,7 @@ public class ConfigurationAnyListenerTest {
                 List.of(RootConfiguration.KEY),
                 new TestConfigurationStorage(LOCAL),
                 generator,
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
 
         assertThat(registry.startAsync(new ComponentContext()), willCompleteSuccessfully());
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/notifications/ConfigurationListenerTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/notifications/ConfigurationListenerTest.java
index ec78048fa04..8d1b6d090bc 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/notifications/ConfigurationListenerTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/notifications/ConfigurationListenerTest.java
@@ -189,8 +189,7 @@ public class ConfigurationListenerTest {
                 List.of(ParentConfiguration.KEY),
                 storage,
                 generator,
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
 
         assertThat(registry.startAsync(new ComponentContext()), willCompleteSuccessfully());
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/sample/UsageTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/sample/UsageTest.java
index 1e29fb70dd4..c38c0886086 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/sample/UsageTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/sample/UsageTest.java
@@ -55,8 +55,7 @@ public class UsageTest {
                 List.of(LocalConfiguration.KEY),
                 new TestConfigurationStorage(LOCAL),
                 new ConfigurationTreeGenerator(LocalConfiguration.KEY),
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
 
         assertThat(registry.startAsync(new ComponentContext()), willCompleteSuccessfully());
@@ -115,8 +114,7 @@ public class UsageTest {
                 List.of(NetworkConfiguration.KEY, LocalConfiguration.KEY),
                 new TestConfigurationStorage(LOCAL),
                 new ConfigurationTreeGenerator(NetworkConfiguration.KEY, LocalConfiguration.KEY),
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
 
         assertThat(registry.startAsync(new ComponentContext()), willCompleteSuccessfully());
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/tree/InternalIdTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/tree/InternalIdTest.java
index 169e03027e7..478ceb29b2f 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/tree/InternalIdTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/tree/InternalIdTest.java
@@ -95,8 +95,7 @@ public class InternalIdTest {
                 List.of(InternalIdParentConfiguration.KEY),
                 new TestConfigurationStorage(LOCAL),
                 generator,
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
 
         assertThat(registry.startAsync(new ComponentContext()), willCompleteSuccessfully());
diff --git a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/tree/NamedListNodeTest.java b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/tree/NamedListNodeTest.java
index 98ac215513a..7c334618a5f 100644
--- a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/tree/NamedListNodeTest.java
+++ b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/tree/NamedListNodeTest.java
@@ -110,8 +110,7 @@ public class NamedListNodeTest {
                 List.of(FirstConfiguration.KEY),
                 storage,
                 cgen,
-                new TestConfigurationValidator(),
-                change -> {}
+                new TestConfigurationValidator()
         );
 
         changer.start();
diff --git a/modules/configuration/src/testFixtures/java/org/apache/ignite/internal/configuration/TestConfigurationChanger.java b/modules/configuration/src/testFixtures/java/org/apache/ignite/internal/configuration/TestConfigurationChanger.java
index c1a4498e9fd..f7a3ceb94e7 100644
--- a/modules/configuration/src/testFixtures/java/org/apache/ignite/internal/configuration/TestConfigurationChanger.java
+++ b/modules/configuration/src/testFixtures/java/org/apache/ignite/internal/configuration/TestConfigurationChanger.java
@@ -23,6 +23,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
+import org.apache.ignite.configuration.KeyIgnorer;
 import org.apache.ignite.configuration.RootKey;
 import org.apache.ignite.internal.configuration.storage.ConfigurationStorage;
 import org.apache.ignite.internal.configuration.tree.InnerNode;
@@ -34,6 +35,16 @@ public class TestConfigurationChanger extends ConfigurationChanger {
     /** Runtime implementations generator for node classes. */
     private final ConfigurationTreeGenerator generator;
 
+    /** Constructor. */
+    public TestConfigurationChanger(
+            Collection<RootKey<?, ?>> rootKeys,
+            ConfigurationStorage storage,
+            ConfigurationTreeGenerator generator,
+            ConfigurationValidator validator
+    ) {
+        this(rootKeys, storage, generator, validator, c -> {}, s -> false);
+    }
+
     /**
      * Constructor.
      */
@@ -42,9 +53,10 @@ public class TestConfigurationChanger extends ConfigurationChanger {
             ConfigurationStorage storage,
             ConfigurationTreeGenerator generator,
             ConfigurationValidator validator,
-            ConfigurationMigrator migrator
+            ConfigurationMigrator migrator,
+            KeyIgnorer keyIgnorer
     ) {
-        super(noOpListener(), rootKeys, storage, validator, migrator);
+        super(noOpListener(), rootKeys, storage, validator, migrator, keyIgnorer);
 
         this.generator = generator;
     }
diff --git a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/distributionzones/ItIgniteDistributionZoneManagerNodeRestartTest.java b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/distributionzones/ItIgniteDistributionZoneManagerNodeRestartTest.java
index 1b69cc019c3..d0a86e349d4 100644
--- a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/distributionzones/ItIgniteDistributionZoneManagerNodeRestartTest.java
+++ b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/distributionzones/ItIgniteDistributionZoneManagerNodeRestartTest.java
@@ -221,8 +221,7 @@ public class ItIgniteDistributionZoneManagerNodeRestartTest extends BaseIgniteRe
                 modules.local().rootKeys(),
                 new LocalFileConfigurationStorage(configFile, localConfigurationGenerator, modules.local()),
                 localConfigurationGenerator,
-                ConfigurationValidatorImpl.withDefaultValidators(localConfigurationGenerator, modules.local().validators()),
-                changer -> {}
+                ConfigurationValidatorImpl.withDefaultValidators(localConfigurationGenerator, modules.local().validators())
         );
 
         NetworkConfiguration networkConfiguration = nodeCfgMgr.configurationRegistry()
@@ -289,8 +288,7 @@ public class ItIgniteDistributionZoneManagerNodeRestartTest extends BaseIgniteRe
                 modules.distributed().rootKeys(),
                 cfgStorage,
                 distributedConfigurationGenerator,
-                ConfigurationValidatorImpl.withDefaultValidators(distributedConfigurationGenerator, validators),
-                changer -> {}
+                ConfigurationValidatorImpl.withDefaultValidators(distributedConfigurationGenerator, validators)
         );
 
         ConfigurationRegistry clusterConfigRegistry = clusterCfgMgr.configurationRegistry();
diff --git a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
index 2e146dbbcd1..82f39c771da 100644
--- a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
+++ b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
@@ -1223,8 +1223,7 @@ public class ItRebalanceDistributedTest extends BaseIgniteAbstractTest {
                     List.of(NodeConfiguration.KEY),
                     new LocalFileConfigurationStorage(configPath, nodeCfgGenerator, null),
                     nodeCfgGenerator,
-                    new TestConfigurationValidator(),
-                    changer -> {}
+                    new TestConfigurationValidator()
             );
 
             clusterService = ClusterServiceTestUtils.clusterService(
@@ -1377,8 +1376,7 @@ public class ItRebalanceDistributedTest extends BaseIgniteAbstractTest {
                     clusterCfgGenerator,
                     ConfigurationValidatorImpl.withDefaultValidators(
                             clusterCfgGenerator, Set.of(new NonNegativeIntegerNumberSystemPropertyValueValidator(REBALANCE_RETRY_DELAY_MS))
-                    ),
-                    changer -> {}
+                    )
             );
 
             ConfigurationRegistry clusterConfigRegistry = clusterCfgMgr.configurationRegistry();
diff --git a/modules/network/src/testFixtures/java/org/apache/ignite/internal/network/utils/ClusterServiceTestUtils.java b/modules/network/src/testFixtures/java/org/apache/ignite/internal/network/utils/ClusterServiceTestUtils.java
index 10eeb600447..9d1dfc7434b 100644
--- a/modules/network/src/testFixtures/java/org/apache/ignite/internal/network/utils/ClusterServiceTestUtils.java
+++ b/modules/network/src/testFixtures/java/org/apache/ignite/internal/network/utils/ClusterServiceTestUtils.java
@@ -221,8 +221,7 @@ public class ClusterServiceTestUtils {
                 Collections.singleton(NodeConfiguration.KEY),
                 new TestConfigurationStorage(ConfigurationType.LOCAL),
                 generator,
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
 
         NetworkConfiguration networkConfiguration = nodeConfigurationMgr.configurationRegistry()
diff --git a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/fixtures/Node.java b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/fixtures/Node.java
index d0fb870f97b..bceb3b9e133 100644
--- a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/fixtures/Node.java
+++ b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/fixtures/Node.java
@@ -360,8 +360,7 @@ public class Node {
                 List.of(NodeConfiguration.KEY),
                 new LocalFileConfigurationStorage(configPath, nodeCfgGenerator, null),
                 nodeCfgGenerator,
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
 
         var clusterIdHolder = new ClusterIdHolder();
@@ -541,8 +540,7 @@ public class Node {
                 List.of(ClusterConfiguration.KEY),
                 cfgStorage,
                 clusterCfgGenerator,
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
 
         ConfigurationRegistry clusterConfigRegistry = clusterCfgMgr.configurationRegistry();
diff --git a/modules/rest/src/test/java/org/apache/ignite/internal/rest/RestComponentTest.java b/modules/rest/src/test/java/org/apache/ignite/internal/rest/RestComponentTest.java
index 93e3368d087..1070943fb5a 100644
--- a/modules/rest/src/test/java/org/apache/ignite/internal/rest/RestComponentTest.java
+++ b/modules/rest/src/test/java/org/apache/ignite/internal/rest/RestComponentTest.java
@@ -91,8 +91,7 @@ public class RestComponentTest extends BaseIgniteAbstractTest {
                 List.of(NodeConfiguration.KEY),
                 new TestConfigurationStorage(LOCAL),
                 generator,
-                new TestConfigurationValidator(),
-                changer -> {}
+                new TestConfigurationValidator()
         );
         assertThat(configurationManager.startAsync(new ComponentContext()), willCompleteSuccessfully());
 
diff --git a/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/TestFactory.java b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/TestFactory.java
index 357d6bed353..7073b05e4db 100644
--- a/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/TestFactory.java
+++ b/modules/rest/src/test/java/org/apache/ignite/internal/rest/configuration/TestFactory.java
@@ -64,8 +64,7 @@ public class TestFactory {
                 List.of(TestRootConfiguration.KEY),
                 new TestConfigurationStorage(LOCAL),
                 generator,
-                ConfigurationValidatorImpl.withDefaultValidators(generator, Set.of(validator)),
-                changer -> {}
+                ConfigurationValidatorImpl.withDefaultValidators(generator, Set.of(validator))
         );
 
         assertThat(configurationRegistry.startAsync(new ComponentContext()), willCompleteSuccessfully());
diff --git a/modules/runner/src/defaultsGenerator/java/org/apache/ignite/internal/configuration/generator/DefaultsGenerator.java b/modules/runner/src/defaultsGenerator/java/org/apache/ignite/internal/configuration/generator/DefaultsGenerator.java
index f9af33af58a..185b50816e4 100644
--- a/modules/runner/src/defaultsGenerator/java/org/apache/ignite/internal/configuration/generator/DefaultsGenerator.java
+++ b/modules/runner/src/defaultsGenerator/java/org/apache/ignite/internal/configuration/generator/DefaultsGenerator.java
@@ -24,6 +24,7 @@ import java.nio.file.Paths;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import org.apache.ignite.configuration.ConfigurationModule;
+import org.apache.ignite.configuration.KeyIgnorer;
 import org.apache.ignite.configuration.RootKey;
 import org.apache.ignite.configuration.annotation.ConfigurationType;
 import org.apache.ignite.internal.configuration.ConfigurationChanger;
@@ -95,7 +96,14 @@ public class DefaultsGenerator {
 
         ConfigurationUpdateListener empty = (oldRoot, newRoot, storageRevision, notificationNumber) -> nullCompletedFuture();
 
-        return new ConfigurationChanger(empty, modules.local().rootKeys(), storage, configurationValidator, c -> {}) {
+        return new ConfigurationChanger(
+                empty,
+                modules.local().rootKeys(),
+                storage,
+                configurationValidator,
+                c -> {},
+                KeyIgnorer.fromDeletedPrefixes(modules.local().deletedPrefixes())
+        ) {
             @Override
             public InnerNode createRootNode(RootKey<?, ?> rootKey) {
                 return localConfigurationGenerator.instantiateNode(rootKey.schemaClass());
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItDistributedConfigurationPropertiesTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItDistributedConfigurationPropertiesTest.java
index 679b93c204d..0955e9c4122 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItDistributedConfigurationPropertiesTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/ItDistributedConfigurationPropertiesTest.java
@@ -270,8 +270,7 @@ public class ItDistributedConfigurationPropertiesTest extends BaseIgniteAbstract
                     List.of(DistributedConfiguration.KEY),
                     distributedCfgStorage,
                     generator,
-                    new TestConfigurationValidator(),
-                    changer -> {}
+                    new TestConfigurationValidator()
             );
         }
 
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 e1986bdc48c..9cb13fe98d8 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
@@ -373,8 +373,7 @@ public class ItIgniteNodeRestartTest extends BaseIgniteRestartTest {
                 modules.local().rootKeys(),
                 new LocalFileConfigurationStorage(configFile, localConfigurationGenerator, modules.local()),
                 localConfigurationGenerator,
-                ConfigurationValidatorImpl.withDefaultValidators(localConfigurationGenerator, modules.local().validators()),
-                changer -> {}
+                ConfigurationValidatorImpl.withDefaultValidators(localConfigurationGenerator, modules.local().validators())
         );
 
         NetworkConfiguration networkConfiguration = nodeCfgMgr.configurationRegistry()
@@ -551,8 +550,7 @@ public class ItIgniteNodeRestartTest extends BaseIgniteRestartTest {
                 modules.distributed().rootKeys(),
                 cfgStorage,
                 distributedConfigurationGenerator,
-                ConfigurationValidatorImpl.withDefaultValidators(distributedConfigurationGenerator, modules.distributed().validators()),
-                changer -> {}
+                ConfigurationValidatorImpl.withDefaultValidators(distributedConfigurationGenerator, modules.distributed().validators())
         );
 
         ConfigurationRegistry clusterConfigRegistry = clusterCfgMgr.configurationRegistry();
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 09c20d8e41e..5561a3d35a4 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
@@ -68,6 +68,7 @@ import org.apache.ignite.client.handler.configuration.ClientConnectorExtensionCo
 import org.apache.ignite.compute.IgniteCompute;
 import org.apache.ignite.configuration.ConfigurationDynamicDefaultsPatcher;
 import org.apache.ignite.configuration.ConfigurationModule;
+import org.apache.ignite.configuration.KeyIgnorer;
 import org.apache.ignite.internal.catalog.CatalogManager;
 import org.apache.ignite.internal.catalog.CatalogManagerImpl;
 import org.apache.ignite.internal.catalog.compaction.CatalogCompactionRunner;
@@ -549,7 +550,8 @@ public class IgniteImpl implements Ignite {
                 localFileConfigurationStorage,
                 localConfigurationGenerator,
                 localConfigurationValidator,
-                modules.local()::migrateDeprecatedConfigurations
+                modules.local()::migrateDeprecatedConfigurations,
+                KeyIgnorer.fromDeletedPrefixes(modules.local().deletedPrefixes())
         );
 
         // Start local configuration to be able to read all local properties.
@@ -766,7 +768,8 @@ public class IgniteImpl implements Ignite {
                 cfgStorage,
                 distributedConfigurationGenerator,
                 distributedCfgValidator,
-                modules.distributed()::migrateDeprecatedConfigurations
+                modules.distributed()::migrateDeprecatedConfigurations,
+                KeyIgnorer.fromDeletedPrefixes(modules.local().deletedPrefixes())
         );
 
         ConfigurationRegistry clusterConfigRegistry = clusterCfgMgr.configurationRegistry();
diff --git a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/CompoundModule.java b/modules/runner/src/main/java/org/apache/ignite/internal/configuration/CompoundModule.java
index fc19c9d9f24..a87888abf3e 100644
--- a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/CompoundModule.java
+++ b/modules/runner/src/main/java/org/apache/ignite/internal/configuration/CompoundModule.java
@@ -89,4 +89,9 @@ public class CompoundModule implements ConfigurationModule {
     public void migrateDeprecatedConfigurations(SuperRootChange superRootChange) {
         modules.forEach(module -> module.migrateDeprecatedConfigurations(superRootChange));
     }
+
+    @Override
+    public Collection<String> deletedPrefixes() {
+        return unionFromModulesExtractedWith(ConfigurationModule::deletedPrefixes);
+    }
 }
diff --git a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/storage/LocalFileConfigurationStorage.java b/modules/runner/src/main/java/org/apache/ignite/internal/configuration/storage/LocalFileConfigurationStorage.java
index c169d632b19..358b25cbec6 100644
--- a/modules/runner/src/main/java/org/apache/ignite/internal/configuration/storage/LocalFileConfigurationStorage.java
+++ b/modules/runner/src/main/java/org/apache/ignite/internal/configuration/storage/LocalFileConfigurationStorage.java
@@ -53,6 +53,7 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import org.apache.ignite.configuration.ConfigurationDynamicDefaultsPatcher;
 import org.apache.ignite.configuration.ConfigurationModule;
+import org.apache.ignite.configuration.KeyIgnorer;
 import org.apache.ignite.configuration.annotation.ConfigurationType;
 import org.apache.ignite.configuration.validation.ConfigurationValidationException;
 import org.apache.ignite.configuration.validation.ValidationIssue;
@@ -169,8 +170,10 @@ public class LocalFileConfigurationStorage implements ConfigurationStorage {
             SuperRoot superRoot = generator.createSuperRoot();
             SuperRoot copiedSuperRoot = superRoot.copy();
 
+            KeyIgnorer keyIgnorer = module == null ? s -> false : KeyIgnorer.fromDeletedPrefixes(module.deletedPrefixes());
+
             Config hocon = readHoconFromFile();
-            HoconConverter.hoconSource(hocon.root()).descend(copiedSuperRoot);
+            HoconConverter.hoconSource(hocon.root(), keyIgnorer).descend(copiedSuperRoot);
 
             Map<String, Serializable> flattenedUpdatesMap = createFlattenedUpdatesMap(superRoot, copiedSuperRoot);
             flattenedUpdatesMap.forEach((key, value) -> {
diff --git a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/storage/LocalFileConfigurationModule.java b/modules/runner/src/test/java/org/apache/ignite/internal/configuration/storage/LocalFileConfigurationModule.java
index a8331c721e1..adc1eb705d9 100644
--- a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/storage/LocalFileConfigurationModule.java
+++ b/modules/runner/src/test/java/org/apache/ignite/internal/configuration/storage/LocalFileConfigurationModule.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.configuration.storage;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 import org.apache.ignite.configuration.ConfigurationModule;
 import org.apache.ignite.configuration.RootKey;
 import org.apache.ignite.configuration.annotation.ConfigurationType;
@@ -36,4 +37,9 @@ class LocalFileConfigurationModule implements ConfigurationModule {
     public Collection<RootKey<?, ?>> rootKeys() {
         return List.of(TopConfiguration.KEY);
     }
+
+    @Override
+    public Collection<String> deletedPrefixes() {
+        return Set.of("top.deleted_property");
+    }
 }
diff --git a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/storage/LocalFileConfigurationStorageTest.java b/modules/runner/src/test/java/org/apache/ignite/internal/configuration/storage/LocalFileConfigurationStorageTest.java
index ffdf5bcda3e..ba8a446d0ec 100644
--- a/modules/runner/src/test/java/org/apache/ignite/internal/configuration/storage/LocalFileConfigurationStorageTest.java
+++ b/modules/runner/src/test/java/org/apache/ignite/internal/configuration/storage/LocalFileConfigurationStorageTest.java
@@ -40,6 +40,7 @@ import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.apache.ignite.configuration.KeyIgnorer;
 import org.apache.ignite.configuration.annotation.Config;
 import org.apache.ignite.configuration.annotation.ConfigValue;
 import org.apache.ignite.configuration.annotation.ConfigurationRoot;
@@ -91,14 +92,16 @@ public class LocalFileConfigurationStorageTest {
 
     @BeforeEach
     void before() {
-        storage = new LocalFileConfigurationStorage(getConfigFile(), treeGenerator, new LocalFileConfigurationModule());
+        LocalFileConfigurationModule module = new LocalFileConfigurationModule();
+        storage = new LocalFileConfigurationStorage(getConfigFile(), treeGenerator, module);
 
         changer = new TestConfigurationChanger(
                 List.of(TopConfiguration.KEY),
                 storage,
                 treeGenerator,
                 new ConfigurationValidatorImpl(treeGenerator, Set.of()),
-                change -> {}
+                change -> {},
+                KeyIgnorer.fromDeletedPrefixes(module.deletedPrefixes())
         );
     }
 
@@ -559,6 +562,19 @@ public class LocalFileConfigurationStorageTest {
         );
     }
 
+    @Test
+    void testReadDataOnStartupWithDeletedProperty() throws IOException {
+        // Given config in JSON format
+        String fileContent = "top.deleted_property = 3";
+
+        Path configFile = getConfigFile();
+
+        Files.write(configFile, fileContent.getBytes(StandardCharsets.UTF_8));
+
+        // Storage ignores deleted property.
+        assertDoesNotThrow(changer::start);
+    }
+
     private String configFileContent() throws IOException {
         return Files.readString(getConfigFile());
     }