Skip to content

Limit processors by available processors #44894

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
merged 7 commits into from
Jul 26, 2019
Merged

Limit processors by available processors #44894

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
931503c
Limit processors by available processors
jasontedor Jul 26, 2019
230fa55
Fix imports
jasontedor Jul 26, 2019
df62e77
More import fixes
jasontedor Jul 26, 2019
5e86b02
Fix wrapping
jasontedor Jul 26, 2019
959cc83
Merge remote-tracking branch 'elastic/master' into limit-processors-b…
jasontedor Jul 26, 2019
9f8a691
Fix test
jasontedor Jul 26, 2019
9d27086
Fix off by one error
jasontedor Jul 26, 2019
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
9 changes: 9 additions & 0 deletions docs/reference/migration/migrate_8_0/settings.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,12 @@ provided automatic upgrading of these settings to their `cluster.remote`
counterparts. In 8.0.0, these settings have been removed. Elasticsearch will
refuse to start if you have these settings in your configuration or cluster
state.

[float]
==== `processors` can no longer exceed the available number of processors

Previously it was possible to set the number of processors used to set the
default sizes for the thread pools to be more than the number of available
processors. As this leads to more context switches and more threads but without
an increase in the number of physical CPUs on which to schedule these additional
threads, the `processors` setting is now bounded by the number of available processors.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: does the last line need wrapping?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I pushed.

22 changes: 4 additions & 18 deletions server/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@

package org.elasticsearch.common.util.concurrent;

import org.apache.logging.log4j.LogManager;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.common.SuppressForbidden;
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Setting.Property;
import org.elasticsearch.common.settings.Settings;
Expand All @@ -48,26 +46,14 @@

public class EsExecutors {

private static final DeprecationLogger deprecationLogger = new DeprecationLogger(LogManager.getLogger(EsExecutors.class));

/**
* Setting to manually set the number of available processors. This setting is used to adjust thread pool sizes per node.
*/
public static final Setting<Integer> PROCESSORS_SETTING = new Setting<>(
public static final Setting<Integer> PROCESSORS_SETTING = Setting.intSetting(
"processors",
s -> Integer.toString(Runtime.getRuntime().availableProcessors()),
s -> {
final int value = Setting.parseInt(s, 1, "processors");
final int availableProcessors = Runtime.getRuntime().availableProcessors();
if (value > availableProcessors) {
deprecationLogger.deprecatedAndMaybeLog(
"processors",
"setting processors to value [{}] which is more than available processors [{}] is deprecated",
value,
availableProcessors);
}
return value;
},
Runtime.getRuntime().availableProcessors(),
1,
Runtime.getRuntime().availableProcessors(),
Property.NodeScope);

/**
Expand Down
12 changes: 12 additions & 0 deletions server/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasToString;
import static org.hamcrest.Matchers.lessThan;

/**
Expand Down Expand Up @@ -388,4 +389,15 @@ public void testGetTasks() throws InterruptedException {
}
}

public void testProcessorsBound() {
final int available = Runtime.getRuntime().availableProcessors();
final int processors = randomIntBetween(available + 1, Integer.MAX_VALUE);
final Settings settings = Settings.builder().put("processors", processors).build();
final IllegalArgumentException e =
expectThrows(IllegalArgumentException.class, () -> EsExecutors.PROCESSORS_SETTING.get(settings));
assertThat(
e,
hasToString(containsString("Failed to parse value [" + processors + "] for setting [processors] must be <= " + available)));
}

}