[grid] check session ownership once

Author: joerg1985

java/src/org/openqa/selenium/grid/node/ForwardWebDriverCommand.java

@@ -17,11 +17,11 @@
 
 package org.openqa.selenium.grid.node;
 
-import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
+import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
 import static org.openqa.selenium.remote.HttpSessionId.getSessionId;
 import static org.openqa.selenium.remote.http.Contents.asJson;
 
-import com.google.common.collect.ImmutableMap;
+import java.util.Map;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.remote.SessionId;
 import org.openqa.selenium.remote.http.HttpHandler;
@@ -48,10 +48,16 @@ public HttpResponse execute(HttpRequest req) {
       return node.executeWebDriverCommand(req);
     }
     return new HttpResponse()
-        .setStatus(HTTP_INTERNAL_ERROR)
+        .setStatus(HTTP_NOT_FOUND)
         .setContent(
             asJson(
-                ImmutableMap.of(
-                    "error", String.format("Session not found in node %s", node.getId()))));
+                Map.of(
+                    "value",
+                    Map.of(
+                        "error", "invalid session id",
+                        "message",
+                            "Cannot find session with id: "
+                                + getSessionId(req.getUri()).orElse(null),
+                        "stacktrace", ""))));
   }
 }

java/src/org/openqa/selenium/grid/node/Node.java

@@ -154,12 +154,7 @@ protected Node(
         combine(
             // "getSessionId" is aggressive about finding session ids, so this needs to be the last
             // route that is checked.
-            matching(
-                    req ->
-                        getSessionId(req.getUri())
-                            .map(SessionId::new)
-                            .map(sessionId -> this.getSession(sessionId) != null)
-                            .orElse(false))
+            matching(req -> getSessionId(req.getUri()).map(SessionId::new).isPresent())
                 .to(() -> new ForwardWebDriverCommand(this))
                 .with(spanDecorator("node.forward_command")),
             new CustomLocatorHandler(this, registrationSecret, customLocators),

java/test/org/openqa/selenium/grid/router/StressTest.java

@@ -77,6 +77,11 @@ public void setupServers() {
                         + "\n"
                         + "session-timeout = 11"
                         + "\n"
+                        + "overwrite-max-sessions = true"
+                        + "\n"
+                        + "max-sessions = "
+                        + Runtime.getRuntime().availableProcessors() * 2
+                        + "\n"
                         + "enable-managed-downloads = true")));
     tearDowns.add(deployment);