Skip to content

Commit 39c9414

Browse files
authored
Remove references to bootstrap.system_call_filter (#85964) (#85972)
1 parent f9d3638 commit 39c9414

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

docs/reference/setup/bootstrap-checks.asciidoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,9 @@ filters are installed to prevent the ability to execute system calls
194194
related to forking as a defense mechanism against arbitrary code
195195
execution attacks on Elasticsearch. The system call filter check ensures
196196
that if system call filters are enabled, then they were successfully
197-
installed. To pass the system call filter check you must either fix any
197+
installed. To pass the system call filter check you must fix any
198198
configuration errors on your system that prevented system call filters
199-
from installing (check your logs), or *at your own risk* disable system
200-
call filters by setting `bootstrap.system_call_filter` to `false`.
199+
from installing (check your logs).
201200

202201
=== OnError and OnOutOfMemoryError checks
203202

server/src/main/java/org/elasticsearch/bootstrap/BootstrapSettings.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,7 @@ private BootstrapSettings() {}
2323
);
2424

2525
public static final Setting<Boolean> MEMORY_LOCK_SETTING = Setting.boolSetting("bootstrap.memory_lock", false, Property.NodeScope);
26-
public static final Setting<Boolean> SYSTEM_CALL_FILTER_SETTING = Setting.boolSetting(
27-
"bootstrap.system_call_filter",
28-
true,
29-
Property.DeprecatedWarning,
30-
Property.NodeScope
31-
);
26+
3227
public static final Setting<Boolean> CTRLHANDLER_SETTING = Setting.boolSetting("bootstrap.ctrlhandler", true, Property.NodeScope);
3328

3429
}

server/src/test/java/org/elasticsearch/bootstrap/BootstrapChecksTests.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -447,12 +447,7 @@ String getUseSerialGC() {
447447

448448
public void testSystemCallFilterCheck() throws NodeValidationException {
449449
final AtomicBoolean isSystemCallFilterInstalled = new AtomicBoolean();
450-
final BootstrapContext context;
451-
if (randomBoolean()) {
452-
context = createTestContext(Settings.builder().put("bootstrap.system_call_filter", true).build(), null);
453-
} else {
454-
context = emptyContext;
455-
}
450+
final BootstrapContext context = emptyContext;
456451

457452
final BootstrapChecks.SystemCallFilterCheck systemCallFilterEnabledCheck = new BootstrapChecks.SystemCallFilterCheck() {
458453

0 commit comments

Comments
 (0)