Jelajahi Sumber

Use insecure settings only when no other secure settings are present (#94921)

* Use insecure settings only when no other secure settings are present
William Brafford 2 tahun lalu
induk
melakukan
a0cf0bf226

+ 2 - 1
server/src/main/java/org/elasticsearch/env/Environment.java

@@ -159,7 +159,8 @@ public class Environment {
             finalSettings.put(Environment.PATH_SHARED_DATA_SETTING.getKey(), sharedDataFile.toString());
         }
 
-        if (DiscoveryNode.isStateless(settings)) {
+        if (DiscoveryNode.isStateless(settings)
+            && (Objects.isNull(finalSettings.getSecureSettings()) || finalSettings.getSecureSettings().getSettingNames().isEmpty())) {
             this.settings = StatelessSecureSettings.install(finalSettings.build());
         } else {
             this.settings = finalSettings.build();