Skip to content
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

[grid] delay the newsessionqueue response #14764

Merged
merged 4 commits into from
Dec 25, 2024
Merged

[grid] delay the newsessionqueue response #14764

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06e064b
[grid] delay the newsessionqueue response
joerg1985 Nov 15, 2024
658b8e9
Merge branch 'trunk' into crazy-polling
VietND96 Dec 24, 2024
c6323a5
Update variable naming with prefix `DEFAULT_`
VietND96 Dec 24, 2024
0ff9e0a
Merge remote-tracking branch 'origin/trunk' into crazy-polling
VietND96 Dec 24, 2024
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
Next Next commit
[grid] delay the newsessionqueue response
  • Loading branch information
@joerg1985
joerg1985 committed Dec 21, 2024
commit 06e064b0bc1359ba0f9a41807a12913b390cfb48
1 change: 1 addition & 0 deletions java/src/org/openqa/selenium/grid/commands/Hub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ protected Handlers createHandlers(Config config) {
distributorOptions.getSlotMatcher(),
newSessionRequestOptions.getSessionRequestTimeoutPeriod(),
newSessionRequestOptions.getSessionRequestTimeout(),
newSessionRequestOptions.getMaximumResponseDelay(),
secret,
newSessionRequestOptions.getBatchSize());
handler.addHandler(queue);
Expand Down
1 change: 1 addition & 0 deletions java/src/org/openqa/selenium/grid/commands/Standalone.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ protected Handlers createHandlers(Config config) {
distributorOptions.getSlotMatcher(),
newSessionRequestOptions.getSessionRequestTimeoutPeriod(),
newSessionRequestOptions.getSessionRequestTimeout(),
newSessionRequestOptions.getMaximumResponseDelay(),
registrationSecret,
newSessionRequestOptions.getBatchSize());
combinedHandler.addHandler(queue);
Expand Down
10 changes: 10 additions & 0 deletions java/src/org/openqa/selenium/grid/sessionqueue/config/NewSessionQueueOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
public class NewSessionQueueOptions {

static final String SESSION_QUEUE_SECTION = "sessionqueue";
static final int MAXIMUM_RESPONSE_DELAY = 8;
static final int DEFAULT_REQUEST_TIMEOUT = 300;
static final int DEFAULT_REQUEST_TIMEOUT_PERIOD = 10;
static final int DEFAULT_RETRY_INTERVAL = 15;
Expand Down Expand Up @@ -89,6 +90,15 @@ public URI getSessionQueueUri() {
}
}

public Duration getMaximumResponseDelay() {
int timeout =
config
.getInt(SESSION_QUEUE_SECTION, "maximum-response-delay")
.orElse(MAXIMUM_RESPONSE_DELAY);

return Duration.ofSeconds(timeout);
}

public Duration getSessionRequestTimeout() {
// If the user sets 0 or less, we default to 1s.
int timeout =
Expand Down
55 changes: 48 additions & 7 deletions java/src/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public class LocalNewSessionQueue extends NewSessionQueue implements Closeable {
private static final String NAME = "Local New Session Queue";
private final SlotMatcher slotMatcher;
private final Duration requestTimeout;
private final Duration maximumResponseDelay;
private final int batchSize;
private final Map<RequestId, Data> requests;
private final Map<RequestId, TraceContext> contexts;
Expand All @@ -115,6 +116,7 @@ public LocalNewSessionQueue(
SlotMatcher slotMatcher,
Duration requestTimeoutCheck,
Duration requestTimeout,
Duration maximumResponseDelay,
Secret registrationSecret,
int batchSize) {
super(tracer, registrationSecret);
Expand All @@ -123,6 +125,7 @@ public LocalNewSessionQueue(
Require.nonNegative("Retry period", requestTimeoutCheck);

this.requestTimeout = Require.positive("Request timeout", requestTimeout);
this.maximumResponseDelay = Require.positive("Maximum response delay", maximumResponseDelay);

this.requests = new ConcurrentHashMap<>();
this.queue = new ConcurrentLinkedDeque<>();
Expand Down Expand Up @@ -152,6 +155,7 @@ public static NewSessionQueue create(Config config) {
slotMatcher,
newSessionQueueOptions.getSessionRequestTimeoutPeriod(),
newSessionQueueOptions.getSessionRequestTimeout(),
newSessionQueueOptions.getMaximumResponseDelay(),
secretOptions.getRegistrationSecret(),
newSessionQueueOptions.getBatchSize());
}
Expand Down Expand Up @@ -234,7 +238,9 @@ public HttpResponse addToQueue(SessionRequest request) {
}

Lock writeLock = this.lock.writeLock();
writeLock.lock();
if (!writeLock.tryLock()) {
writeLock.lock();
}
try {
requests.remove(request.getRequestId());
queue.remove(request);
Expand Down Expand Up @@ -268,7 +274,9 @@ Data injectIntoQueue(SessionRequest request) {
Data data = new Data(request.getEnqueued());

Lock writeLock = lock.writeLock();
writeLock.lock();
if (!writeLock.tryLock()) {
writeLock.lock();
}
try {
requests.put(request.getRequestId(), data);
queue.addLast(request);
Expand All @@ -288,7 +296,9 @@ public boolean retryAddToQueue(SessionRequest request) {
contexts.getOrDefault(request.getRequestId(), tracer.getCurrentContext());
try (Span ignored = context.createSpan("sessionqueue.retry")) {
Lock writeLock = lock.writeLock();
writeLock.lock();
if (!writeLock.tryLock()) {
writeLock.lock();
}
try {
if (!requests.containsKey(request.getRequestId())) {
return false;
Expand Down Expand Up @@ -319,7 +329,9 @@ public Optional<SessionRequest> remove(RequestId reqId) {
Require.nonNull("Request ID", reqId);

Lock writeLock = lock.writeLock();
writeLock.lock();
if (!writeLock.tryLock()) {
writeLock.lock();
}
try {
Iterator<SessionRequest> iterator = queue.iterator();
while (iterator.hasNext()) {
Expand All @@ -340,6 +352,29 @@ public Optional<SessionRequest> remove(RequestId reqId) {
public List<SessionRequest> getNextAvailable(Map<Capabilities, Long> stereotypes) {
Require.nonNull("Stereotypes", stereotypes);

// use nano time to avoid issues with a jumping clock e.g. on WSL2 or due to time-sync
long started = System.nanoTime();
// delay the response to avoid heavy polling via http
while (maximumResponseDelay.toNanos() > System.nanoTime() - started) {
Lock readLock = lock.readLock();
readLock.lock();

try {
if (!queue.isEmpty()) {
break;
}
} finally {
readLock.unlock();
}

try {
Thread.sleep(10);
} catch (InterruptedException ex) {
Thread.currentThread().interrupt();
break;
}
}

Predicate<Capabilities> matchesStereotype =
caps ->
stereotypes.entrySet().stream()
Expand All @@ -355,7 +390,9 @@ public List<SessionRequest> getNextAvailable(Map<Capabilities, Long> stereotypes
});

Lock writeLock = lock.writeLock();
writeLock.lock();
if (!writeLock.tryLock()) {
writeLock.lock();
}
try {
List<SessionRequest> availableRequests =
queue.stream()
Expand All @@ -381,7 +418,9 @@ public boolean complete(
try (Span ignored = context.createSpan("sessionqueue.completed")) {
Data data;
Lock writeLock = lock.writeLock();
writeLock.lock();
if (!writeLock.tryLock()) {
writeLock.lock();
}
try {
data = requests.remove(reqId);
queue.removeIf(req -> reqId.equals(req.getRequestId()));
Expand All @@ -401,7 +440,9 @@ public boolean complete(
@Override
public int clearQueue() {
Lock writeLock = lock.writeLock();
writeLock.lock();
if (!writeLock.tryLock()) {
writeLock.lock();
}

try {
int size = queue.size();
Expand Down
1 change: 1 addition & 0 deletions java/test/org/openqa/selenium/grid/distributor/AddingNodesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ public void setUpDistributor() throws MalformedURLException {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);

Expand Down
4 changes: 4 additions & 0 deletions java/test/org/openqa/selenium/grid/distributor/DistributorDrainingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ void drainedNodeDoesNotShutDownIfNotEmpty() throws InterruptedException {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);
LocalNode node =
Expand Down Expand Up @@ -106,6 +107,7 @@ void drainedNodeShutsDownAfterSessionsFinish() throws InterruptedException {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);
LocalNode node =
Expand Down Expand Up @@ -182,6 +184,7 @@ void testDrainedNodeShutsDownOnceEmpty() throws InterruptedException {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);
LocalNode node =
Expand Down Expand Up @@ -234,6 +237,7 @@ void drainingNodeDoesNotAcceptNewSessions() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);
LocalNode node =
Expand Down
5 changes: 5 additions & 0 deletions java/test/org/openqa/selenium/grid/distributor/DistributorNodeAvailabilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ void shouldBeAbleToRemoveANode() throws MalformedURLException {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);

Expand Down Expand Up @@ -147,6 +148,7 @@ void shouldIncludeHostsThatAreUpInHostList() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);
handler.addHandler(sessions);
Expand Down Expand Up @@ -219,6 +221,7 @@ void shouldNotRemoveNodeWhoseHealthCheckPassesBeforeThreshold() throws Interrupt
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);

Expand Down Expand Up @@ -281,6 +284,7 @@ void shouldReturnNodesThatWereDownToPoolOfNodesOnceTheyMarkTheirHealthCheckPasse
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);

Expand Down Expand Up @@ -338,6 +342,7 @@ void shouldBeAbleToAddANodeAndCreateASession() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);
LocalNode node =
Expand Down
4 changes: 4 additions & 0 deletions java/test/org/openqa/selenium/grid/distributor/DistributorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ void creatingASessionAddsItToTheSessionMap() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);

Expand Down Expand Up @@ -134,6 +135,7 @@ void shouldReleaseSlotOnceSessionEnds() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);

Expand Down Expand Up @@ -203,6 +205,7 @@ void shouldNotStartASessionIfTheCapabilitiesAreNotSupported() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);
handler.addHandler(sessions);
Expand Down Expand Up @@ -243,6 +246,7 @@ void attemptingToStartASessionWhichFailsMarksAsTheSlotAsAvailable() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);

Expand Down
1 change: 1 addition & 0 deletions java/test/org/openqa/selenium/grid/distributor/DistributorTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ public void setUp() throws URISyntaxException {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);

Expand Down
4 changes: 4 additions & 0 deletions java/test/org/openqa/selenium/grid/distributor/SessionSchedulingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ void theMostLightlyLoadedNodeIsSelectedFirst() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);

Expand Down Expand Up @@ -121,6 +122,7 @@ void shouldUseLastSessionCreatedTimeAsTieBreaker() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);
Node leastRecent = createNode(caps, 5, 0);
Expand Down Expand Up @@ -192,6 +194,7 @@ void shouldNotScheduleAJobIfAllSlotsAreBeingUsed() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);

Expand Down Expand Up @@ -247,6 +250,7 @@ void shouldPrioritizeHostsWithTheMostSlotsAvailableForASessionType() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);

Expand Down
7 changes: 7 additions & 0 deletions java/test/org/openqa/selenium/grid/distributor/local/LocalDistributorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ void testAddNodeToDistributor() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);
Distributor distributor =
Expand Down Expand Up @@ -157,6 +158,7 @@ void testRemoveNodeFromDistributor() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);
Distributor distributor =
Expand Down Expand Up @@ -195,6 +197,7 @@ void testAddSameNodeTwice() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);
Distributor distributor =
Expand Down Expand Up @@ -228,6 +231,7 @@ void shouldBeAbleToAddMultipleSessionsConcurrently() throws Exception {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);

Expand Down Expand Up @@ -321,6 +325,7 @@ void testDrainNodeFromDistributor() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);
Distributor distributor =
Expand Down Expand Up @@ -366,6 +371,7 @@ void testDrainNodeFromNode() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);
Distributor distributor =
Expand Down Expand Up @@ -396,6 +402,7 @@ void slowStartingNodesShouldNotCauseReservationsToBeSerialized() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);

Expand Down
1 change: 1 addition & 0 deletions java/test/org/openqa/selenium/grid/graphql/GraphqlHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ public void setupGrid() {
new DefaultSlotMatcher(),
Duration.ofSeconds(2),
Duration.ofSeconds(2),
Duration.ofSeconds(1),
registrationSecret,
5);

Expand Down
Loading
Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy