Skip to content

Commit a6b104d

Browse files
authored
Fix max file size check to use getMaxFileSize (#113723)
* Fix max file size check to use getMaxFileSize * Update docs/changelog/113723.yaml * CURSE YOU SPOTLESS
1 parent 9365efb commit a6b104d

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

docs/changelog/113723.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 113723
2+
summary: Fix max file size check to use `getMaxFileSize`
3+
area: Infra/Core
4+
type: bug
5+
issues:
6+
- 113705

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -412,12 +412,12 @@ static class MaxFileSizeCheck implements BootstrapCheck {
412412

413413
@Override
414414
public BootstrapCheckResult check(BootstrapContext context) {
415-
final long maxFileSize = getMaxFileSize();
415+
final long maxFileSize = getProcessLimits().maxFileSize();
416416
if (maxFileSize != Long.MIN_VALUE && maxFileSize != ProcessLimits.UNLIMITED) {
417417
final String message = String.format(
418418
Locale.ROOT,
419419
"max file size [%d] for user [%s] is too low, increase to [unlimited]",
420-
getMaxFileSize(),
420+
maxFileSize,
421421
BootstrapInfo.getSystemProperties().get("user.name")
422422
);
423423
return BootstrapCheckResult.failure(message);
@@ -426,8 +426,8 @@ public BootstrapCheckResult check(BootstrapContext context) {
426426
}
427427
}
428428

429-
long getMaxFileSize() {
430-
return NativeAccess.instance().getProcessLimits().maxVirtualMemorySize();
429+
protected ProcessLimits getProcessLimits() {
430+
return NativeAccess.instance().getProcessLimits();
431431
}
432432

433433
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,8 @@ public void testMaxFileSizeCheck() throws NodeValidationException {
389389
final AtomicLong maxFileSize = new AtomicLong(randomIntBetween(0, Integer.MAX_VALUE));
390390
final BootstrapChecks.MaxFileSizeCheck check = new BootstrapChecks.MaxFileSizeCheck() {
391391
@Override
392-
long getMaxFileSize() {
393-
return maxFileSize.get();
392+
protected ProcessLimits getProcessLimits() {
393+
return new ProcessLimits(ProcessLimits.UNKNOWN, ProcessLimits.UNKNOWN, maxFileSize.get());
394394
}
395395
};
396396

0 commit comments

Comments
 (0)