More remove

albertzaharovits · Jul 15, 2024 · 306da25 · 306da25
1 parent cd8ea06
commit 306da25
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 29 deletions.
diff --git a/server/src/main/java/org/elasticsearch/common/settings/SettingsModule.java b/server/src/main/java/org/elasticsearch/common/settings/SettingsModule.java
@@ -37,7 +37,6 @@ public class SettingsModule implements Module {
     private final Set<String> settingsFilterPattern = new HashSet<>();
     private final Map<String, Setting<?>> nodeSettings = new HashMap<>();
     private final Map<String, Setting<?>> indexSettings = new HashMap<>();
-    private final Set<Setting<?>> consistentSettings = new HashSet<>();
     private final IndexScopedSettings indexScopedSettings;
     private final ClusterSettings clusterSettings;
     private final SettingsFilter settingsFilter;
@@ -161,29 +160,13 @@ private void registerSetting(Setting<?> setting) {
                 if (existingSetting != null) {
                     throw new IllegalArgumentException("Cannot register setting [" + setting.getKey() + "] twice");
                 }
-                if (setting.isConsistent()) {
-                    if (setting instanceof Setting.AffixSetting<?>) {
-                        if (((Setting.AffixSetting<?>) setting).getConcreteSettingForNamespace("_na_") instanceof SecureSetting<?>) {
-                            consistentSettings.add(setting);
-                        } else {
-                            throw new IllegalArgumentException("Invalid consistent secure setting [" + setting.getKey() + "]");
-                        }
-                    } else if (setting instanceof SecureSetting<?>) {
-                        consistentSettings.add(setting);
-                    } else {
-                        throw new IllegalArgumentException("Invalid consistent secure setting [" + setting.getKey() + "]");
-                    }
-                }
                 nodeSettings.put(setting.getKey(), setting);
             }
             if (setting.hasIndexScope()) {
                 Setting<?> existingSetting = indexSettings.get(setting.getKey());
                 if (existingSetting != null) {
                     throw new IllegalArgumentException("Cannot register setting [" + setting.getKey() + "] twice");
                 }
-                if (setting.isConsistent()) {
-                    throw new IllegalStateException("Consistent setting [" + setting.getKey() + "] cannot be index scoped");
-                }
                 indexSettings.put(setting.getKey(), setting);
             }
         } else {
@@ -224,10 +207,6 @@ public ClusterSettings getClusterSettings() {
         return clusterSettings;
     }
 
-    public Set<Setting<?>> getConsistentSettings() {
-        return consistentSettings;
-    }
-
     public SettingsFilter getSettingsFilter() {
         return settingsFilter;
     }

diff --git a/server/src/main/java/org/elasticsearch/node/NodeConstruction.java b/server/src/main/java/org/elasticsearch/node/NodeConstruction.java
@@ -217,7 +217,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -1170,13 +1169,6 @@ private ClusterService createClusterService(SettingsModule settingsModule, Threa
             taskManager
         );
         resourcesToClose.add(clusterService);
-
-        Set<Setting<?>> consistentSettings = settingsModule.getConsistentSettings();
-        if (consistentSettings.isEmpty() == false) {
-            clusterService.addLocalNodeMasterListener(
-                new ConsistentSettingsService(settingsModule.getSettings(), clusterService, consistentSettings).newHashPublisher()
-            );
-        }
         return clusterService;
     }