Skip to content

Commit

Permalink
[grid]: Make NodeStatus contain some useful information
Browse files Browse the repository at this point in the history 
This means including the stereotype capabilities it supports
(allowing remote matching to be partially possible), and the
set of current active sessions, which could be used to build
a meaningful status page.
  • Loading branch information
@shs96c
shs96c committed Feb 13, 2019
1 parent 0e8def4 commit 797d004
Show file tree
Hide file tree
Showing 7 changed files with 156 additions and 62 deletions.
116 changes: 92 additions & 24 deletions java/server/src/org/openqa/selenium/grid/data/NodeStatus.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,50 +17,56 @@

package org.openqa.selenium.grid.data;

import static com.google.common.collect.ImmutableList.toImmutableList;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;

import org.openqa.selenium.Capabilities;
import org.openqa.selenium.ImmutableCapabilities;
import org.openqa.selenium.json.JsonException;
import org.openqa.selenium.remote.SessionId;

import java.net.URI;
import java.net.URISyntaxException;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.UUID;

public class NodeStatus {

private final UUID nodeId;
private final URI externalUri;
private final int maxSessionCount;
private final Map<Capabilities, Integer> available;
private final Map<Capabilities, Integer> used;
private final Map<Capabilities, Integer> stereotypes;
private final Set<Active> snapshot;

public NodeStatus(
UUID nodeId,
URI externalUri,
int maxSessionCount,
Map<Capabilities, Integer> available,
Map<Capabilities, Integer> used) {
Map<Capabilities, Integer> stereotypes,
Collection<Active> snapshot) {
this.nodeId = Objects.requireNonNull(nodeId);
this.externalUri = Objects.requireNonNull(externalUri);
Preconditions.checkArgument(maxSessionCount > 0, "Max session count must be greater than 0.");
this.maxSessionCount = maxSessionCount;

this.available = ImmutableMap.copyOf(Objects.requireNonNull(available));
this.used = ImmutableMap.copyOf(Objects.requireNonNull(used));
this.stereotypes = ImmutableMap.copyOf(Objects.requireNonNull(stereotypes));
this.snapshot = ImmutableSet.copyOf(Objects.requireNonNull(snapshot));
}

public boolean hasCapacity() {
return !available.isEmpty();
return !stereotypes.isEmpty();
}

public boolean hasCapacity(Capabilities caps) {
return available.getOrDefault(caps, 0) > 0;
return stereotypes.getOrDefault(caps, 0) > 0;
}

public UUID getNodeId() {
Expand All @@ -75,12 +81,12 @@ public int getMaxSessionCount() {
return maxSessionCount;
}

public Map<Capabilities, Integer> getAvailable() {
return available;
public Map<Capabilities, Integer> getStereotypes() {
return stereotypes;
}

public Map<Capabilities, Integer> getUsed() {
return used;
public Set<Active> getCurrentSessions() {
return snapshot;
}


Expand All @@ -94,23 +100,22 @@ public boolean equals(Object o) {
return Objects.equals(this.nodeId, that.nodeId) &&
Objects.equals(this.externalUri, that.externalUri) &&
this.maxSessionCount == that.maxSessionCount &&
Objects.equals(this.available, that.available) &&
Objects.equals(this.used, that.used);
Objects.equals(this.stereotypes, that.stereotypes) &&
Objects.equals(this.snapshot, that.snapshot);
}

@Override
public int hashCode() {
return Objects.hash(nodeId, externalUri, maxSessionCount, available, used);
return Objects.hash(nodeId, externalUri, maxSessionCount, stereotypes, snapshot);
}

private Map<String, Object> toJson() {
return ImmutableMap.of(
"id", nodeId,
"uri", externalUri,
"maxSessions", maxSessionCount,
"capacity", ImmutableMap.of(
"available", asCapacity(available),
"used", asCapacity(used)));
"stereotypes", asCapacity(stereotypes),
"sessions", snapshot);
}

private List<Map<String, Object>> asCapacity(Map<Capabilities, Integer> toConvert) {
Expand All @@ -124,13 +129,22 @@ private List<Map<String, Object>> asCapacity(Map<Capabilities, Integer> toConver
}

public static NodeStatus fromJson(Map<String, Object> raw) {
List<Active> sessions = ((Collection<?>) raw.get("sessions")).stream()
.map(item -> {
@SuppressWarnings("unchecked")
Map<String, Object> converted = (Map<String, Object>) item;
return converted;
})
.map(Active::fromJson)
.collect(toImmutableList());

try {
return new NodeStatus(
UUID.fromString((String) raw.get("id")),
new URI((String) raw.get("uri")),
((Number) raw.get("maxSessions")).intValue(),
readCapacityNamed(raw, "available"),
readCapacityNamed(raw, "used"));
readCapacityNamed(raw, "stereotypes"),
sessions);
} catch (URISyntaxException e) {
throw new JsonException(e);
}
Expand All @@ -139,11 +153,8 @@ public static NodeStatus fromJson(Map<String, Object> raw) {
private static Map<Capabilities, Integer> readCapacityNamed(
Map<String, Object> raw,
String name) {
Map<?, ?> rawCapacity = (Map<?, ?>) raw.get("capacity");
List<?> kind = (List<?>) rawCapacity.get(name);

ImmutableMap.Builder<Capabilities, Integer> capacity = ImmutableMap.builder();
kind.forEach(obj -> {
((Collection<?>) raw.get(name)).forEach(obj -> {
Map<?, ?> cap = (Map<?, ?>) obj;
capacity.put(
new ImmutableCapabilities((Map<?, ?>) cap.get("capabilities")),
Expand All @@ -152,4 +163,61 @@ private static Map<Capabilities, Integer> readCapacityNamed(

return capacity.build();
}

public static class Active {

private final Capabilities stereotype;
private final SessionId id;
private final Capabilities currentCapabilities;

public Active(Capabilities stereotype, SessionId id, Capabilities currentCapabilities) {
this.stereotype = ImmutableCapabilities.copyOf(Objects.requireNonNull(stereotype));
this.id = Objects.requireNonNull(id);
this.currentCapabilities =
ImmutableCapabilities.copyOf(Objects.requireNonNull(currentCapabilities));
}

public Capabilities getStereotype() {
return stereotype;
}

public SessionId getSessionId() {
return id;
}

public Capabilities getCurrentCapabilities() {
return currentCapabilities;
}

@Override
public boolean equals(Object o) {
if (!(o instanceof Active)) {
return false;
}
Active that = (Active) o;
return Objects.equals(this.getStereotype(), that.getStereotype()) &&
Objects.equals(this.id, that.id) &&
Objects.equals(this.getCurrentCapabilities(), that.getCurrentCapabilities());
}

@Override
public int hashCode() {
return Objects.hash(getStereotype(), id, getCurrentCapabilities());
}

private Map<String, Object> toJson() {
return ImmutableMap.of(
"sessionId", getSessionId(),
"stereotype", getStereotype(),
"currentCapabilities", getCurrentCapabilities());
}

private static Active fromJson(Map<String, Object> raw) {
SessionId id = new SessionId((String) raw.get("sessionId"));
Capabilities stereotype = new ImmutableCapabilities((Map<?, ?>) raw.get("stereotype"));
Capabilities current = new ImmutableCapabilities((Map<?, ?>) raw.get("currentCapabilities"));

return new Active(stereotype, id, current);
}
}
}
27 changes: 20 additions & 7 deletions java/server/src/org/openqa/selenium/grid/distributor/local/Host.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package org.openqa.selenium.grid.distributor.local;

import static java.util.stream.Collectors.*;
import static java.util.stream.Collectors.groupingBy;
import static org.openqa.selenium.grid.distributor.local.Host.Status.DOWN;
import static org.openqa.selenium.grid.distributor.local.Host.Status.DRAINING;
import static org.openqa.selenium.grid.distributor.local.Host.Status.UP;
Expand All @@ -33,13 +35,16 @@
import org.openqa.selenium.grid.data.NodeStatus;

import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Supplier;
import java.util.logging.Logger;
import java.util.stream.Collectors;

class Host {

Expand All @@ -57,16 +62,24 @@ public Host(Node node) {
this.node = Objects.requireNonNull(node);
NodeStatus status = getStatus();

// This is grossly inefficient. But we're on a modern processor and we're expecting 10s to 100s
// of nodes, so this is probably ok.
Set<NodeStatus.Active> sessions = status.getCurrentSessions();
Map<Capabilities, Integer> actives = sessions.parallelStream().collect(
groupingBy(NodeStatus.Active::getStereotype, summingInt(active -> 1)));

ImmutableList.Builder<Slot> slots = ImmutableList.builder();
status.getAvailable().forEach((caps, count) -> {
for (int i = 0; i < count; i++) {
slots.add(new Slot(node, caps, AVAILABLE));
status.getStereotypes().forEach((caps, count) -> {
if (actives.containsKey(caps)) {
Integer activeCount = actives.get(caps);
for (int i = 0; i < activeCount; i++) {
slots.add(new Slot(node, caps, ACTIVE));
}
count -= activeCount;
}
});
status.getUsed().forEach((caps, count) -> {

for (int i = 0; i < count; i++) {
Slot slot = new Slot(node, caps, ACTIVE);
slots.add(slot);
slots.add(new Slot(node, caps, AVAILABLE));
}
});
this.slots = slots.build();
Expand Down

0 comments on commit 797d004

Please sign in to comment.