[grid] Honoring max concurrent sessions setting

Author: diemol

java/server/src/org/openqa/selenium/grid/graphql/Grid.java

@@ -87,6 +87,7 @@ public List<Node> getNodes() {
         status.getUri(),
         status.getAvailability(),
         status.getMaxSessionCount(),
+        status.getSlots().size(),
         stereotypes,
         sessions,
         status.getVersion(),
@@ -107,10 +108,7 @@ public int getSessionCount() {
 
   public int getTotalSlots() {
     return distributorStatus.get().getNodes().stream()
-      .mapToInt(status -> {
-        int slotCount = status.getSlots().size();
-        return Math.min(status.getMaxSessionCount(), slotCount);
-      })
+      .mapToInt(status -> status.getSlots().size())
       .sum();
   }
 
@@ -123,6 +121,7 @@ public int getSessionQueueSize() {
   }
 
   public List<String> getSessionQueueRequests() {
+    //noinspection unchecked
     return ((List<Capabilities>) queueInfoMap.get("request-payloads")).stream()
       .map(JSON::toJson)
       .collect(Collectors.toList());

java/server/src/org/openqa/selenium/grid/graphql/Node.java

@@ -43,12 +43,14 @@ public class Node {
   private final Map<Session, Slot> activeSessions;
   private final String version;
   private final OsInfo osInfo;
+  private final int slotCount;
 
 
   public Node(NodeId id,
               URI uri,
               Availability status,
               int maxSession,
+              int slotCount,
               Map<Capabilities, Integer> stereotypes,
               Map<Session, Slot> activeSessions,
               String version,
@@ -57,6 +59,7 @@ public Node(NodeId id,
     this.uri = Require.nonNull("Node uri", uri);
     this.status = status;
     this.maxSession = maxSession;
+    this.slotCount = slotCount;
     this.stereotypes = Require.nonNull("Node stereotypes", stereotypes);
     this.activeSessions = Require.nonNull("Active sessions", activeSessions);
     this.version = Require.nonNull("Grid Node version", version);
@@ -69,6 +72,10 @@ public List<org.openqa.selenium.grid.graphql.Session> getSessions() {
       .collect(ImmutableList.toImmutableList());
   }
 
+  public int getSlotCount() {
+    return slotCount;
+  }
+
   public int getSessionCount() {
     return activeSessions.size();
   }

java/server/src/org/openqa/selenium/grid/graphql/selenium-grid-schema.graphqls

@@ -38,6 +38,7 @@ type Node {
   uri: Uri!
   status: Status!
   maxSession: Int!
+  slotCount: Int!
   sessions: [Session]!
   sessionCount: Int!
   stereotypes: String!

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

@@ -534,7 +534,7 @@ public static class Builder {
     private final URI gridUri;
     private final Secret registrationSecret;
     private final ImmutableList.Builder<SessionSlot> factories;
-    private int maxCount = Runtime.getRuntime().availableProcessors() * 5;
+    private int maxCount = Runtime.getRuntime().availableProcessors();
     private Ticker ticker = Ticker.systemTicker();
     private Duration sessionTimeout = Duration.ofMinutes(5);
     private HealthCheck healthCheck;

java/server/src/org/openqa/selenium/grid/node/local/LocalNodeFactory.java

@@ -59,7 +59,9 @@ public static Node create(Config config) {
       eventOptions.getEventBus(),
       serverOptions.getExternalUri(),
       nodeOptions.getPublicGridUri().orElseGet(serverOptions::getExternalUri),
-      secretOptions.getRegistrationSecret());
+      secretOptions.getRegistrationSecret())
+      .maximumConcurrentSessions(nodeOptions.getMaxSessions());
+
 
     List<DriverService.Builder<?, ?>> builders = new ArrayList<>();
     ServiceLoader.load(DriverService.Builder.class).forEach(builders::add);