Skip to content

[grid] reject requests only if it has been in the queue before trying… #12336

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 2 commits into from
Jul 17, 2023
Merged

[grid] reject requests only if it has been in the queue before trying… #12336

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
407e853
[grid] reject requests only if it has been in the queue before trying…
joerg1985 Jul 10, 2023
284a482
Merge branch 'trunk' into new-session-race
diemol Jul 16, 2023
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
24 changes: 17 additions & 7 deletions java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,17 @@ private class NewSessionRunnable implements Runnable {

@Override
public void run() {
boolean loop = true;
Set<RequestId> inQueue;
boolean loop;
if (rejectUnsupportedCaps) {
inQueue = sessionQueue.getQueueContents().stream()
.map(SessionRequestCapability::getRequestId)
.collect(Collectors.toSet());
loop = !inQueue.isEmpty();
} else {
inQueue = null;
loop = true;
}
while (loop) {
// We deliberately run this outside of a lock: if we're unsuccessful
// starting the session, we just put the request back on the queue.
Expand All @@ -762,13 +772,11 @@ public void run() {
Map<Capabilities, Long> stereotypes =
getAvailableNodes().stream()
.filter(NodeStatus::hasCapacity)
.map(
.flatMap(
node ->
node.getSlots().stream()
.map(Slot::getStereotype)
.collect(Collectors.toList()))
.flatMap(Collection::stream)
.collect(Collectors.groupingBy(ImmutableCapabilities::new, Collectors.counting()));
.map(Slot::getStereotype))
.collect(Collectors.groupingBy(ImmutableCapabilities::copyOf, Collectors.counting()));

if (!stereotypes.isEmpty()) {
List<SessionRequest> matchingRequests = sessionQueue.getNextAvailable(stereotypes);
Expand All @@ -780,7 +788,9 @@ public void run() {
}
}
if (rejectUnsupportedCaps) {
checkMatchingSlot(sessionQueue.getQueueContents());
checkMatchingSlot(sessionQueue.getQueueContents().stream()
.filter((src) -> inQueue.contains(src.getRequestId()))
.collect(Collectors.toList()));
}
}

Expand Down