Skip to content

Fix Test Failure in ScalingThreadPoolTests (#44898) #44901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
original-brownbear merged 1 commit into from
Jul 26, 2019
Merged

Fix Test Failure in ScalingThreadPoolTests (#44898) #44901

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion server/src/test/java/org/elasticsearch/threadpool/ScalingThreadPoolTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,17 @@ public void testScalingThreadPoolConfiguration() throws InterruptedException {
core = "generic".equals(threadPoolName) ? 4 : 1; // the defaults
}

final int availableProcessors = Runtime.getRuntime().availableProcessors();
final int maxBasedOnNumberOfProcessors;
final int processorsUsed;
if (randomBoolean()) {
final int processors = randomIntBetween(1, 64);
maxBasedOnNumberOfProcessors = expectedSize(threadPoolName, processors);
builder.put("processors", processors);
processorsUsed = processors;
} else {
maxBasedOnNumberOfProcessors = expectedSize(threadPoolName, Runtime.getRuntime().availableProcessors());
maxBasedOnNumberOfProcessors = expectedSize(threadPoolName, availableProcessors);
processorsUsed = availableProcessors;
}

final int expectedMax;
Expand Down Expand Up @@ -93,6 +97,11 @@ public void testScalingThreadPoolConfiguration() throws InterruptedException {
assertThat(info.getMax(), equalTo(expectedMax));
assertThat(esThreadPoolExecutor.getMaximumPoolSize(), equalTo(expectedMax));
});

if (processorsUsed > availableProcessors) {
assertWarnings("setting processors to value [" + processorsUsed +
"] which is more than available processors [" + availableProcessors + "] is deprecated");
}
}

private int expectedSize(final String threadPoolName, final int numberOfProcessors) {
Expand Down