Skip to content

Commit 8b649c9

Browse files
diemoldiemol
committed
[grid] Using Node default values everywhere
Part of the work needed for #9045
1 parent d39a7e3 commit 8b649c9

4 files changed

Lines changed: 23 additions & 22 deletions

File tree

‎java/server/src/org/openqa/selenium/grid/node/config/NodeFlags.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ public class NodeFlags implements HasRoles {
5252
public int maxSessions = DEFAULT_MAX_SESSIONS;
5353

5454
@Parameter(
55-
names = {"--timeout","--session-timeout"},
56-
description = "Let X be the session-timeout in seconds. " +
57-
"The Node will automatically kill a session that has not had any activity in the last X seconds." +
58-
"This will release the slot for other tests.")
55+
names = {"--session-timeout"},
56+
description = "Let X be the session-timeout in seconds. The Node will automatically kill "
57+
+ "a session that has not had any activity in the last X seconds. " +
58+
"This will release the slot for other tests.")
5959
@ConfigValue(section = NODE_SECTION, name = "session-timeout", example = "60")
6060
public int sessionTimeout = DEFAULT_SESSION_TIMEOUT;
6161

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@
5656

5757
public class NodeOptions {
5858

59+
public static final int DEFAULT_MAX_SESSIONS = Runtime.getRuntime().availableProcessors();
60+
public static final int DEFAULT_HEARTBEAT_PERIOD = 60;
61+
public static final int DEFAULT_SESSION_TIMEOUT = 300;
5962
static final String NODE_SECTION = "node";
6063
static final boolean DEFAULT_DETECT_DRIVERS = true;
61-
static final int DEFAULT_HEARTBEAT_PERIOD = 60;
62-
static final int DEFAULT_MAX_SESSIONS = Runtime.getRuntime().availableProcessors();
63-
static final int DEFAULT_SESSION_TIMEOUT = 300;
6464
static final int DEFAULT_REGISTER_CYCLE = 10;
6565
static final int DEFAULT_REGISTER_PERIOD = 120;
6666

@@ -139,7 +139,7 @@ public int getMaxSessions() {
139139
}
140140

141141
public Duration getSessionTimeout() {
142-
// If the user sets 0 or less, we default to 10s.
142+
// If the user sets 10s or less, we default to 10s.
143143
int seconds = Math.max(
144144
config.getInt(NODE_SECTION, "session-timeout").orElse(DEFAULT_SESSION_TIMEOUT),
145145
10);

‎java/server/src/org/openqa/selenium/grid/node/local/LocalNode.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
import org.openqa.selenium.grid.node.HealthCheck;
6666
import org.openqa.selenium.grid.node.Node;
6767
import org.openqa.selenium.grid.node.SessionFactory;
68+
import org.openqa.selenium.grid.node.config.NodeOptions;
6869
import org.openqa.selenium.grid.security.Secret;
6970
import org.openqa.selenium.internal.Either;
7071
import org.openqa.selenium.internal.Require;
@@ -553,11 +554,11 @@ public static class Builder {
553554
private final URI gridUri;
554555
private final Secret registrationSecret;
555556
private final ImmutableList.Builder<SessionSlot> factories;
556-
private int maxCount = Runtime.getRuntime().availableProcessors();
557+
private int maxCount = NodeOptions.DEFAULT_MAX_SESSIONS;
557558
private Ticker ticker = Ticker.systemTicker();
558-
private Duration sessionTimeout = Duration.ofMinutes(5);
559+
private Duration sessionTimeout = Duration.ofSeconds(NodeOptions.DEFAULT_SESSION_TIMEOUT);
559560
private HealthCheck healthCheck;
560-
private Duration heartbeatPeriod = Duration.ofSeconds(10);
561+
private Duration heartbeatPeriod = Duration.ofSeconds(NodeOptions.DEFAULT_HEARTBEAT_PERIOD);
561562

562563
private Builder(
563564
Tracer tracer,

‎java/server/test/org/openqa/selenium/grid/distributor/DistributorTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,18 @@
1717

1818
package org.openqa.selenium.grid.distributor;
1919

20+
import static org.assertj.core.api.Assertions.assertThat;
21+
import static org.assertj.core.api.Assertions.fail;
22+
import static org.junit.Assert.assertFalse;
23+
import static org.junit.Assert.assertTrue;
24+
import static org.openqa.selenium.grid.data.Availability.DOWN;
25+
import static org.openqa.selenium.grid.data.Availability.UP;
26+
import static org.openqa.selenium.remote.http.Contents.utf8String;
27+
import static org.openqa.selenium.remote.http.HttpMethod.POST;
28+
2029
import com.google.common.collect.ImmutableMap;
2130
import com.google.common.collect.ImmutableSet;
22-
import org.assertj.core.api.AbstractAssert;
31+
2332
import org.junit.Assert;
2433
import org.junit.Before;
2534
import org.junit.Ignore;
@@ -28,7 +37,6 @@
2837
import org.openqa.selenium.ImmutableCapabilities;
2938
import org.openqa.selenium.MutableCapabilities;
3039
import org.openqa.selenium.NoSuchSessionException;
31-
import org.openqa.selenium.RetrySessionRequestException;
3240
import org.openqa.selenium.SessionNotCreatedException;
3341
import org.openqa.selenium.TimeoutException;
3442
import org.openqa.selenium.events.EventBus;
@@ -90,15 +98,6 @@
9098
import java.util.logging.Logger;
9199
import java.util.stream.Collectors;
92100

93-
import static org.assertj.core.api.Assertions.assertThat;
94-
import static org.assertj.core.api.Assertions.fail;
95-
import static org.junit.Assert.assertFalse;
96-
import static org.junit.Assert.assertTrue;
97-
import static org.openqa.selenium.grid.data.Availability.DOWN;
98-
import static org.openqa.selenium.grid.data.Availability.UP;
99-
import static org.openqa.selenium.remote.http.Contents.utf8String;
100-
import static org.openqa.selenium.remote.http.HttpMethod.POST;
101-
102101
public class DistributorTest {
103102

104103
private static final Logger LOG = Logger.getLogger("Distributor Test");
@@ -171,6 +170,7 @@ public void shouldStartHeartBeatOnNodeRegistration() {
171170
.add(
172171
caps,
173172
new TestSessionFactory((id, c) -> new Session(id, nodeUri, stereotype, c, Instant.now())))
173+
.heartbeatPeriod(Duration.ofSeconds(10))
174174
.build();
175175

176176
Distributor distributor = new LocalDistributor(

0 commit comments

Comments
 (0)