Skip to content

Commit bafa265

Browse files
committed
[grid] Removing default value for max-sessions
It is already in the code then the option is retrieved, but additionally it means that it was taking precedence over the value configured on the `config.toml`. This fixes SeleniumHQ/docker-selenium#1128
1 parent a9527db commit bafa265

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

java/server/src/org/openqa/selenium/grid/node/config/NodeOptions.java

+8-3
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,7 @@ public Node getNode() {
7878
public Map<Capabilities, Collection<SessionFactory>> getSessionFactories(
7979
/* Danger! Java stereotype ahead! */ Function<WebDriverInfo, Collection<SessionFactory>> factoryFactory) {
8080

81-
int maxSessions = Math.min(
82-
config.getInt("node", "max-concurrent-sessions").orElse(Runtime.getRuntime().availableProcessors()),
83-
Runtime.getRuntime().availableProcessors());
81+
int maxSessions = getMaxSessions();
8482

8583
Map<WebDriverInfo, Collection<SessionFactory>> allDrivers = discoverDrivers(maxSessions, factoryFactory);
8684

@@ -93,6 +91,13 @@ public Map<Capabilities, Collection<SessionFactory>> getSessionFactories(
9391
return sessionFactories.build().asMap();
9492
}
9593

94+
public int getMaxSessions() {
95+
return Math.min(
96+
config.getInt("node", "max-concurrent-sessions")
97+
.orElse(Runtime.getRuntime().availableProcessors()),
98+
Runtime.getRuntime().availableProcessors());
99+
}
100+
96101
private void addDriverFactoriesFromConfig(ImmutableMultimap.Builder<Capabilities, SessionFactory> sessionFactories) {
97102
config.getAll("node", "driver-factories").ifPresent(allConfigs -> {
98103
if (allConfigs.size() % 2 != 0) {

java/server/src/org/openqa/selenium/grid/node/httpd/NodeFlags.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class NodeFlags implements HasRoles {
3838
names = "--max-sessions",
3939
description = "Maximum number of concurrent sessions.")
4040
@ConfigValue(section = "node", name = "max-concurrent-sessions", example = "8")
41-
public int maxSessions = Runtime.getRuntime().availableProcessors();
41+
public int maxSessions;
4242

4343
@Parameter(
4444
names = {"--detect-drivers"}, arity = 1,

0 commit comments

Comments
 (0)